diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 16:24:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:19:58 +0200 |
| commit | 2b37864e7f2bb78fd78904074f03449f70331e3d (patch) | |
| tree | e69100e9ec952178637e8569796735921fe3388d /libavformat/rawdec.c | |
| parent | 18255441dd74e0bde4fbc8f2f6a1a356fc14df6e (diff) | |
| parent | 2d6e58497e76836604364b037df9b00ba3d75b69 (diff) | |
| download | ffmpeg-2b37864e7f2bb78fd78904074f03449f70331e3d.tar.gz | |
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index ca9b2829d6..69b95bc6e9 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -84,6 +84,7 @@ int ff_raw_video_read_header(AVFormatContext *s) st->codec->codec_id = s->iformat->raw_codec_id; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; + st->codec->framerate = s1->framerate; st->codec->time_base = av_inv_q(s1->framerate); avpriv_set_pts_info(st, 64, 1, 1200000); |