diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/idroqenc.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
| download | ffmpeg-6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.tar.gz | |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/idroqenc.c')
| -rw-r--r-- | libavformat/idroqenc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c index 28a3aba9d4..8122efef83 100644 --- a/libavformat/idroqenc.c +++ b/libavformat/idroqenc.c @@ -29,25 +29,24 @@ static int roq_write_header(struct AVFormatContext *s) 0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, /* fps: */ 0x1E, 0x00 }; int n; - AVCodecContext *avctx; // set the actual fps for(n=0;n<s->nb_streams;n++) { - if ((avctx=s->streams[n]->codec)->codec_type == AVMEDIA_TYPE_VIDEO) { + if (s->streams[n]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { unsigned int fps; - if (avctx->time_base.num != 1) { - av_log(avctx, AV_LOG_ERROR, "Frame rate must be integer\n"); + if (s->streams[n]->avg_frame_rate.den != 1) { + av_log(s, AV_LOG_ERROR, "Frame rate must be integer\n"); return AVERROR(EINVAL); } - if ((fps=avctx->time_base.den) > 255) { - av_log(avctx, AV_LOG_ERROR, "Frame rate may not exceed 255fps\n"); + if ((fps=s->streams[n]->avg_frame_rate.num) > 255) { + av_log(s, AV_LOG_ERROR, "Frame rate may not exceed 255fps\n"); return AVERROR(EINVAL); } if (fps != 30) { - av_log(avctx, AV_LOG_WARNING, "For vintage compatibility fps must be 30\n"); + av_log(s, AV_LOG_WARNING, "For vintage compatibility fps must be 30\n"); } header[6] = fps; |