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 /tests/api/api-h264-test.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 'tests/api/api-h264-test.c')
| -rw-r--r-- | tests/api/api-h264-test.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c index acf1636b39..ef3a1fefff 100644 --- a/tests/api/api-h264-test.c +++ b/tests/api/api-h264-test.c @@ -32,7 +32,8 @@ static int video_decode_example(const char *input_filename) { AVCodec *codec = NULL; - AVCodecContext *origin_ctx = NULL, *ctx= NULL; + AVCodecContext *ctx= NULL; + AVCodecParameters *origin_par = NULL; AVFrame *fr = NULL; uint8_t *byte_buffer = NULL; AVPacket pkt; @@ -63,9 +64,9 @@ static int video_decode_example(const char *input_filename) return -1; } - origin_ctx = fmt_ctx->streams[video_stream]->codec; + origin_par = fmt_ctx->streams[video_stream]->codecpar; - codec = avcodec_find_decoder(origin_ctx->codec_id); + codec = avcodec_find_decoder(origin_par->codec_id); if (!codec) { av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); return -1; @@ -77,7 +78,7 @@ static int video_decode_example(const char *input_filename) return AVERROR(ENOMEM); } - result = avcodec_copy_context(ctx, origin_ctx); + result = avcodec_parameters_to_context(ctx, origin_par); if (result) { av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); return result; |