ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of use of separator, just use \n

This commit is contained in:
Isaac Connor 2016-06-21 14:06:07 -04:00
parent dfc885a12a
commit 7496dc392f
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zm_ffmpeg.cpp
View File

@ -349,15 +349,8 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
AVStream *st = ic->streams[i];
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
unsigned char *separator = ic->dump_separator;
char **codec_separator = (char **)av_opt_ptr(st->codec->av_class, st->codec, "dump_separator");
int use_format_separator = !*codec_separator;
if (use_format_separator)
*codec_separator = av_strdup((const char *)separator);
avcodec_string(buf, sizeof(buf), st->codec, is_output);
if (use_format_separator)
av_freep(codec_separator);
Debug(3, " Stream #%d:%d", index, i);
/* the pid is an important information, so we display it */
@ -389,7 +382,7 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
int tbc = st->codec->time_base.den && st->codec->time_base.num;
if (fps || tbr || tbn || tbc)
Debug(3, "%s", separator);
Debug(3, "\n" );
if (fps)
zm_log_fps(av_q2d(st->avg_frame_rate), tbr || tbn || tbc ? "fps, " : "fps");