[FFmpeg-cvslog] ffmpeg: replace "flush Media" with "flush_media" in benchmark_all output
Stefano Sabatini
git at videolan.org
Fri Jan 29 11:36:37 CET 2016
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Jan 27 12:46:36 2016 +0100| [b91093a4111ffc947f3387325a377bb1694a87dd] | committer: Stefano Sabatini
ffmpeg: replace "flush Media" with "flush_media" in benchmark_all output
Simplify parsing and consistency.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b91093a4111ffc947f3387325a377bb1694a87dd
---
ffmpeg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 97aca10..a5ec3c3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1711,11 +1711,11 @@ static void flush_encoders(void)
switch (enc->codec_type) {
case AVMEDIA_TYPE_AUDIO:
encode = avcodec_encode_audio2;
- desc = "Audio";
+ desc = "audio";
break;
case AVMEDIA_TYPE_VIDEO:
encode = avcodec_encode_video2;
- desc = "Video";
+ desc = "video";
break;
default:
stop_encoding = 1;
@@ -1731,7 +1731,7 @@ static void flush_encoders(void)
update_benchmark(NULL);
ret = encode(enc, &pkt, NULL, &got_packet);
- update_benchmark("flush %s %d.%d", desc, ost->file_index, ost->index);
+ update_benchmark("flush_%s %d.%d", desc, ost->file_index, ost->index);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n",
desc,
More information about the ffmpeg-cvslog
mailing list