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/microdvdenc.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/microdvdenc.c')
| -rw-r--r-- | libavformat/microdvdenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/microdvdenc.c b/libavformat/microdvdenc.c index 4d8438437b..04f475b645 100644 --- a/libavformat/microdvdenc.c +++ b/libavformat/microdvdenc.c @@ -25,21 +25,21 @@ static int microdvd_write_header(struct AVFormatContext *s) { - AVCodecContext *avctx = s->streams[0]->codec; - AVRational tb = avctx->time_base; + AVCodecParameters *par = s->streams[0]->codecpar; + AVRational framerate = s->streams[0]->avg_frame_rate; - if (s->nb_streams != 1 || avctx->codec_id != AV_CODEC_ID_MICRODVD) { + if (s->nb_streams != 1 || par->codec_id != AV_CODEC_ID_MICRODVD) { av_log(s, AV_LOG_ERROR, "Exactly one MicroDVD stream is needed.\n"); return -1; } - if (avctx->extradata && avctx->extradata_size > 0) { + if (par->extradata && par->extradata_size > 0) { avio_write(s->pb, "{DEFAULT}{}", 11); - avio_write(s->pb, avctx->extradata, avctx->extradata_size); + avio_write(s->pb, par->extradata, par->extradata_size); avio_flush(s->pb); } - avpriv_set_pts_info(s->streams[0], 64, tb.num, tb.den); + avpriv_set_pts_info(s->streams[0], 64, framerate.num, framerate.den); return 0; } |