Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:30:43 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:38:36 +0000 (14:38 +0200)
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
tests/ref/lavf/wtv

index 10311ef..f3e1a75 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2673,6 +2673,8 @@ static int transcode_init(void)
                            av_get_pix_fmt_name(ost->filter->filter->inputs[0]->format));
                 enc_ctx->pix_fmt = ost->filter->filter->inputs[0]->format;
 
+                ost->st->avg_frame_rate = ost->frame_rate;
+
                 if (!dec_ctx ||
                     enc_ctx->width   != dec_ctx->width  ||
                     enc_ctx->height  != dec_ctx->height ||
index dd55af7..b0ae7d1 100644 (file)
@@ -1,3 +1,3 @@
-fc6436e36e32a2c5c01f3e31df1c2cd1 *./tests/data/lavf/lavf.wtv
+b74b14ee41830aed90380bf6252dcfdb *./tests/data/lavf/lavf.wtv
 413696 ./tests/data/lavf/lavf.wtv
 ./tests/data/lavf/lavf.wtv CRC=0x71287e25