diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:40:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:40:04 +0100 |
| commit | f016a23c7fa0b089a394e25eeefa5d5f4d99d926 (patch) | |
| tree | 150ac256bf70e36cdf7f072209d3871f0ede55ac /libavcodec/cdxl.c | |
| parent | 5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc (diff) | |
| parent | c7a5acabc537c2ce363165c31250aba341b1a990 (diff) | |
| download | ffmpeg-streaming-f016a23c7fa0b089a394e25eeefa5d5f4d99d926.zip ffmpeg-streaming-f016a23c7fa0b089a394e25eeefa5d5f4d99d926.tar.gz | |
Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'
* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
dnxhddec: stop using deprecated avcodec_set_dimensions
dirac: stop using deprecated avcodec_set_dimensions
cdxl: stop using deprecated avcodec_set_dimensions
avs: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdxl.c')
| -rw-r--r-- | libavcodec/cdxl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 93a5537..13ad57c 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -245,10 +245,8 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } - if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); aligned_width = FFALIGN(c->avctx->width, 16); c->padded_bits = aligned_width - c->avctx->width; |
