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/tee.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/tee.c')
| -rw-r--r-- | libavformat/tee.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/tee.c b/libavformat/tee.c index 139070556c..bb344e6231 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -226,7 +226,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) st2->sample_aspect_ratio = st->sample_aspect_ratio; st2->avg_frame_rate = st->avg_frame_rate; av_dict_copy(&st2->metadata, st->metadata, 0); - if ((ret = avcodec_copy_context(st2->codec, st->codec)) < 0) + if ((ret = avcodec_parameters_copy(st2->codecpar, st->codecpar)) < 0) goto end; } @@ -347,8 +347,8 @@ static void log_slave(TeeSlave *slave, void *log_ctx, int log_level) AVBitStreamFilterContext *bsf = slave->bsfs[i]; av_log(log_ctx, log_level, " stream:%d codec:%s type:%s", - i, avcodec_get_name(st->codec->codec_id), - av_get_media_type_string(st->codec->codec_type)); + i, avcodec_get_name(st->codecpar->codec_id), + av_get_media_type_string(st->codecpar->codec_type)); if (bsf) { av_log(log_ctx, log_level, " bsfs:"); while (bsf) { |