[FFmpeg-cvslog] ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  5 03:19:28 2011 +0100| [618fb9cc062c6ca1146cc90911daab5a2317b25f] | committer: Michael Niedermayer

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

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=618fb9cc062c6ca1146cc90911daab5a2317b25f
---

 ffmpeg.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 90f05ce..880e452 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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){