diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
| commit | bf92cd8178e0553a27971118e2b2b9e87e7b810b (patch) | |
| tree | 3cab52ceebfa519d6a8eaccc123e81bcab48f45f /libavcodec/indeo3.c | |
| parent | e6b9d71ad9569b5d033058958da5155100ada1ab (diff) | |
| parent | 967cd6fafbf2fdec9cbe011296ad34a70212427e (diff) | |
Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'
* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
libopenjpegdec: stop using deprecated avcodec_set_dimensions
kgv1dec: stop using deprecated avcodec_set_dimensions
ivi_common: stop using deprecated avcodec_set_dimensions
indeo3: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo3.c')
| -rw-r--r-- | libavcodec/indeo3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index b8827634e1..ddb4ad0dee 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -956,7 +956,7 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx, AVCodecContext *avctx, free_frame_buffers(ctx); if ((res = allocate_frame_buffers(ctx, avctx, width, height)) < 0) return res; - avcodec_set_dimensions(avctx, width, height); + ff_set_dimensions(avctx, width, height); } y_offset = bytestream2_get_le32(&gb); |