virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

Browse Source 
* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-09 21:44:25 +02:00
parent 4b13ec69c6 3f3232a371
commit 8e7c8325d2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@@ -2878,6 +2878,8 @@ static int transcode_init(void)
exit_program(1); exit_program(1);
} }
ost->st->codec->codec= ost->enc_ctx->codec; ost->st->codec->codec= ost->enc_ctx->codec;
ost->st->time_base = ost->enc_ctx->time_base;
} }
/* init input streams */ /* init input streams */