Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 21:44:25 +02:00 · 2014-07-09 21:44:25 +02:00 · 8e7c8325d2
commit 8e7c8325d2
parent 4b13ec69c6 3f3232a371
1 changed files with 2 additions and 0 deletions
--- a/ffmpeg.c
+++ b/ffmpeg.c
@ -2878,6 +2878,8 @@ static int transcode_init(void)
            exit_program(1);
        }
        ost->st->codec->codec= ost->enc_ctx->codec;
+
+        ost->st->time_base = ost->enc_ctx->time_base;
    }

    /* init input streams */