diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
| commit | 98ca3fb9cf7fdfad38e731ffb029fa3f96b94581 (patch) | |
| tree | f1cec553a2ad4be7135cc63adc061bc234f38c64 /libavcodec/vp56.c | |
| parent | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (diff) | |
| parent | 757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be (diff) | |
Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
vp8: stop using deprecated avcodec_set_dimensions
vp56: stop using deprecated avcodec_set_dimensions
vp3: stop using deprecated avcodec_set_dimensions
txd: stop using deprecated avcodec_set_dimensions
truemotion1: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/txd.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 6b9f3860bf..b3b9e3e4e5 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -470,7 +470,7 @@ static int vp56_size_changed(VP56Context *s) s->mb_height = (avctx->coded_height+15) / 16; if (s->mb_width > 1000 || s->mb_height > 1000) { - avcodec_set_dimensions(avctx, 0, 0); + ff_set_dimensions(avctx, 0, 0); av_log(avctx, AV_LOG_ERROR, "picture too big\n"); return -1; } |