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/srtenc.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/srtenc.c')
| -rw-r--r-- | libavformat/srtenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index 24c25ec643..d811a4da0e 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -39,16 +39,16 @@ static int srt_write_header(AVFormatContext *avf) SRTContext *srt = avf->priv_data; if (avf->nb_streams != 1 || - avf->streams[0]->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) { + avf->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { av_log(avf, AV_LOG_ERROR, "SRT supports only a single subtitles stream.\n"); return AVERROR(EINVAL); } - if (avf->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT && - avf->streams[0]->codec->codec_id != AV_CODEC_ID_SUBRIP) { + if (avf->streams[0]->codecpar->codec_id != AV_CODEC_ID_TEXT && + avf->streams[0]->codecpar->codec_id != AV_CODEC_ID_SUBRIP) { av_log(avf, AV_LOG_ERROR, "Unsupported subtitles codec: %s\n", - avcodec_get_name(avf->streams[0]->codec->codec_id)); + avcodec_get_name(avf->streams[0]->codecpar->codec_id)); return AVERROR(EINVAL); } avpriv_set_pts_info(avf->streams[0], 64, 1, 1000); |