aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-03-06 22:25:53 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-03-06 22:25:53 +0000
commit5189573c6d31816705cbecaa8e527fcf606ee060 (patch)
treec9c2f3229fcb77e35cf9834ce135c1e92dae1c20
parent192c14fa5510e8b5e13ed5796ae87aabbfad84d6 (diff)
downloadffmpeg-5189573c6d31816705cbecaa8e527fcf606ee060.tar.gz
Set GXF fallback time-base to match the one specified for audio-only.
Originally committed as revision 22257 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/gxf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index afcf8df1f0..774f61aedc 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -351,8 +351,10 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) {
} else
av_log(s, AV_LOG_INFO, "UMF packet missing\n");
url_fskip(pb, len);
+ // set a fallback value, 60000/1001 is specified for audio-only files
+ // so use that regardless of why we do not know the video frame rate.
if (!main_timebase.num || !main_timebase.den)
- main_timebase = (AVRational){1, 50}; // set some arbitrary fallback
+ main_timebase = (AVRational){1001, 60000};
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
av_set_pts_info(st, 32, main_timebase.num, main_timebase.den);