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/lrcenc.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/lrcenc.c')
| -rw-r--r-- | libavformat/lrcenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index 74268cc681..c5fda64738 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -39,15 +39,15 @@ static int lrc_write_header(AVFormatContext *s) const AVDictionaryEntry *metadata_item; if(s->nb_streams != 1 || - s->streams[0]->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) { + s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { av_log(s, AV_LOG_ERROR, "LRC supports only a single subtitle stream.\n"); return AVERROR(EINVAL); } - if(s->streams[0]->codec->codec_id != AV_CODEC_ID_SUBRIP && - s->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT) { + if(s->streams[0]->codecpar->codec_id != AV_CODEC_ID_SUBRIP && + s->streams[0]->codecpar->codec_id != AV_CODEC_ID_TEXT) { av_log(s, AV_LOG_ERROR, "Unsupported subtitle codec: %s\n", - avcodec_get_name(s->streams[0]->codec->codec_id)); + avcodec_get_name(s->streams[0]->codecpar->codec_id)); return AVERROR(EINVAL); } avpriv_set_pts_info(s->streams[0], 64, 1, 100); |