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/dirac.c | |
| parent | 5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc (diff) | |
| parent | c7a5acabc537c2ce363165c31250aba341b1a990 (diff) | |
| download | ffmpeg-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/dirac.c')
| -rw-r--r-- | libavcodec/dirac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index e132acc44a..3dad75a30c 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -30,6 +30,7 @@ #include "dirac.h" #include "avcodec.h" #include "golomb.h" +#include "internal.h" #include "mpeg12data.h" /* defaults for source parameters */ @@ -317,11 +318,10 @@ int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, if (ret = parse_source_parameters(avctx, gb, source)) return ret; - if (ret = av_image_check_size(source->width, source->height, 0, avctx)) + ret = ff_set_dimensions(avctx, source->width, source->height); + if (ret < 0) return ret; - avcodec_set_dimensions(avctx, source->width, source->height); - /* [DIRAC_STD] picture_coding_mode shall be 0 for fields and 1 for frames * currently only used to signal field coding */ picture_coding_mode = svq3_get_ue_golomb(gb); |