diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:50:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:54:40 +0100 |
| commit | e6b9d71ad9569b5d033058958da5155100ada1ab (patch) | |
| tree | 963773bd0d58dea1732b6b5c15b1cdb77e9db580 /libavcodec/h261dec.c | |
| parent | 599c285162197dae164704131b8f3ff6276c8496 (diff) | |
| parent | 3b086317277e3f3b61c0343930d8e2570b278bd6 (diff) | |
| download | ffmpeg-e6b9d71ad9569b5d033058958da5155100ada1ab.tar.gz | |
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
h26[13]dec: stop using deprecated avcodec_set_dimensions
gifdec: stop using deprecated avcodec_set_dimensions
g2meet: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/gifdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 26b885587f..241099eeff 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -30,6 +30,7 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" +#include "internal.h" #define H261_MBA_VLC_BITS 9 #define H261_MTYPE_VLC_BITS 6 @@ -609,7 +610,9 @@ retry: s->parse_context = pc; } if (!s->context_initialized) { - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; goto retry; } |