[SCM] libav/experimental: Unset variable fps for mov and mp4 muxer, they support it but timestamps must start at 0 currently, and this causes sync problem.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 91360ce61d00bb20429fb41857abebf50a5c6b1d
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Tue Nov 23 00:41:28 2010 +0000

    Unset variable fps for mov and mp4 muxer, they support it
    but timestamps must start at 0 currently, and this causes sync
    problem.
    
    Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 77f122b..b1ad714 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2215,7 +2215,7 @@ AVOutputFormat mov_muxer = {
     mov_write_header,
     ff_mov_write_packet,
     mov_write_trailer,
-    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
+    .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
 };
 #endif
@@ -2247,7 +2247,7 @@ AVOutputFormat mp4_muxer = {
     mov_write_header,
     ff_mov_write_packet,
     mov_write_trailer,
-    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
+    .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
 };
 #endif

-- 
Libav/FFmpeg packaging