diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-05 03:19:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-05 03:19:28 +0100 |
commit | 618fb9cc062c6ca1146cc90911daab5a2317b25f (patch) | |
tree | 845472b79c23cb410f6fe35f7b49d1bcbb5675ec /ffmpeg.c | |
parent | 707138593af5c4783035d0b9cc2d7c8cb2137dfa (diff) | |
download | ffmpeg-618fb9cc062c6ca1146cc90911daab5a2317b25f.tar.gz |
ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2205,7 +2205,10 @@ static int transcode_init(OutputFile *output_files, int nb_output_files, codec->time_base.num *= icodec->ticks_per_frame; codec->time_base.den *= 2; } - } else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS)) { + } else if(!(oc->oformat->flags & AVFMT_VARIABLE_FPS) + && strcmp(oc->oformat->name, "mov") && strcmp(oc->oformat->name, "mp4") && strcmp(oc->oformat->name, "3gp") + && strcmp(oc->oformat->name, "3g2") && strcmp(oc->oformat->name, "psp") && strcmp(oc->oformat->name, "ipod") + ) { if( copy_tb<0 && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500 || copy_tb==0){ |