RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 06:02:12 +00:00
Code Issues Projects Releases Wiki Activity

ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-05 03:19:28 +01:00
parent 707138593a
commit 618fb9cc06
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -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.num *= icodec->ticks_per_frame;
codec->time_base.den *= 2; 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) 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 && av_q2d(ist->st->time_base) < 1.0/500
|| copy_tb==0){ || copy_tb==0){