diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-06 14:19:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-06 14:19:17 +0000 |
| commit | 80ce3254ac86d11e8e1468cab32df8e704e5adf2 (patch) | |
| tree | 926f52cec55edbc3b765807b806997e4184cd518 /libavformat/raw.c | |
| parent | 291fe90ae89a8847acbddb1a208e327d6572f5a7 (diff) | |
| download | ffmpeg-80ce3254ac86d11e8e1468cab32df8e704e5adf2.tar.gz | |
always honor the user specified frame rate if set
Originally committed as revision 4186 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
| -rw-r--r-- | libavformat/raw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index b33cdf9533..e70be2b706 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -235,14 +235,14 @@ static int video_read_header(AVFormatContext *s, /* for mjpeg, specify frame rate */ /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/ - if (st->codec.codec_id == CODEC_ID_MJPEG || - st->codec.codec_id == CODEC_ID_MPEG4) { - if (ap && ap->time_base.num) { - av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); - } else { - av_set_pts_info(st, 64, 1, 25); - } + if (ap && ap->time_base.num) { + av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); + } else if ( st->codec.codec_id == CODEC_ID_MJPEG || + st->codec.codec_id == CODEC_ID_MPEG4 || + st->codec.codec_id == CODEC_ID_H264) { + av_set_pts_info(st, 64, 1, 25); } + return 0; } |