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/hls.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/hls.c')
| -rw-r--r-- | libavformat/hls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index fb87954316..7953e825bb 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1384,7 +1384,7 @@ static void add_metadata_from_renditions(AVFormatContext *s, struct playlist *pl for (i = 0; i < pls->ctx->nb_streams; i++) { AVStream *st = s->streams[pls->stream_offset + i]; - if (st->codec->codec_type != type) + if (st->codecpar->codec_type != type) continue; for (; rend_idx < pls->n_renditions; rend_idx++) { @@ -1659,7 +1659,7 @@ static int hls_read_header(AVFormatContext *s) } st->id = i; - avcodec_copy_context(st->codec, pls->ctx->streams[j]->codec); + avcodec_parameters_copy(st->codecpar, pls->ctx->streams[j]->codecpar); if (pls->is_id3_timestamped) /* custom timestamps via id3 */ avpriv_set_pts_info(st, 33, 1, MPEG_TIME_BASE); |