diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 14:07:34 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 14:07:41 +0100 |
| commit | 030e69b4dcb92f3b0372c9af1cefba60e9135010 (patch) | |
| tree | 416bad22b7551a65ff9e54a47511da5d5d6346d6 | |
| parent | d76972b58156fc09d0caf26d4bd6462c22be51f1 (diff) | |
| parent | a9e1f2cc61cbd5606a087a60565e87923c39de5a (diff) | |
| download | ffmpeg-030e69b4dcb92f3b0372c9af1cefba60e9135010.tar.gz | |
Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'
* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
examples/qsvdec: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | doc/examples/qsvdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/examples/qsvdec.c b/doc/examples/qsvdec.c index fd934bebd3..aaecd81d4c 100644 --- a/doc/examples/qsvdec.c +++ b/doc/examples/qsvdec.c @@ -352,7 +352,7 @@ int main(int argc, char **argv) for (i = 0; i < input_ctx->nb_streams; i++) { AVStream *st = input_ctx->streams[i]; - if (st->codec->codec_id == AV_CODEC_ID_H264 && !video_st) + if (st->codecpar->codec_id == AV_CODEC_ID_H264 && !video_st) video_st = st; else st->discard = AVDISCARD_ALL; @@ -404,16 +404,16 @@ int main(int argc, char **argv) goto finish; } decoder_ctx->codec_id = AV_CODEC_ID_H264; - if (video_st->codec->extradata_size) { - decoder_ctx->extradata = av_mallocz(video_st->codec->extradata_size + + if (video_st->codecpar->extradata_size) { + decoder_ctx->extradata = av_mallocz(video_st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!decoder_ctx->extradata) { ret = AVERROR(ENOMEM); goto finish; } - memcpy(decoder_ctx->extradata, video_st->codec->extradata, - video_st->codec->extradata_size); - decoder_ctx->extradata_size = video_st->codec->extradata_size; + memcpy(decoder_ctx->extradata, video_st->codecpar->extradata, + video_st->codecpar->extradata_size); + decoder_ctx->extradata_size = video_st->codecpar->extradata_size; } decoder_ctx->refcounted_frames = 1; |