diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-12-26 22:28:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-12-26 22:28:22 +0000 |
| commit | 9de0be61bec565c8ad7ea48c169aed4d55144b5c (patch) | |
| tree | 03870bffe0dafbe5db4078f4e27c2199fcbfec41 /libavformat | |
| parent | b4abe1d198ac5542b4f87a357134f14c7fbf7baa (diff) | |
| download | ffmpeg-9de0be61bec565c8ad7ea48c169aed4d55144b5c.tar.gz | |
Do not force fps unless the user actually specified one.
fixes issue309
Originally committed as revision 11322 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/raw.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 08e75c5f59..7efa716a53 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -85,7 +85,10 @@ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap) av_set_pts_info(st, 64, 1, st->codec->sample_rate); break; case CODEC_TYPE_VIDEO: - av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); + if(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); st->codec->width = ap->width; st->codec->height = ap->height; st->codec->pix_fmt = ap->pix_fmt; |