virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vp3: stop using deprecated avcodec_set_dimensions

Browse Source
This commit is contained in:
Anton Khirnov 2013-10-27 10:02:26 +01:00
parent 3cfdb912cb
commit b53febc1c0
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vp3.c
View File

@ -2166,6 +2166,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int visible_width, visible_height, colorspace; int visible_width, visible_height, colorspace;
int offset_x = 0, offset_y = 0; int offset_x = 0, offset_y = 0;
int ret;
AVRational fps, aspect; AVRational fps, aspect;
s->theora = get_bits_long(gb, 24); s->theora = get_bits_long(gb, 24);
@ -2182,12 +2183,6 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
visible_width = s->width = get_bits(gb, 16) << 4; visible_width = s->width = get_bits(gb, 16) << 4;
visible_height = s->height = get_bits(gb, 16) << 4; visible_height = s->height = get_bits(gb, 16) << 4;
if(av_image_check_size(s->width, s->height, 0, avctx)){
av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
s->width= s->height= 0;
return -1;
}
if (s->theora >= 0x030200) { if (s->theora >= 0x030200) {
visible_width = get_bits_long(gb, 24); visible_width = get_bits_long(gb, 24);
visible_height = get_bits_long(gb, 24); visible_height = get_bits_long(gb, 24);
@ -2234,9 +2229,11 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
if ( visible_width <= s->width && visible_width > s->width-16 if ( visible_width <= s->width && visible_width > s->width-16
&& visible_height <= s->height && visible_height > s->height-16 && visible_height <= s->height && visible_height > s->height-16
&& !offset_x && (offset_y == s->height - visible_height)) && !offset_x && (offset_y == s->height - visible_height))
avcodec_set_dimensions(avctx, visible_width, visible_height); ret = ff_set_dimensions(avctx, visible_width, visible_height);
else else
avcodec_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
if (colorspace == 1) { if (colorspace == 1) {
avctx->color_primaries = AVCOL_PRI_BT470M; avctx->color_primaries = AVCOL_PRI_BT470M;