RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb' 

* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
  webp: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 15:55:55 +01:00
parent 98ca3fb9cf 0a9e94bba8
commit 8b2dd04afc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/webp.c
View File

@ -1085,10 +1085,10 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p,
s->width, w);
}
s->height = h;
ret = av_image_check_size(s->width, s->height, 0, avctx);
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
avcodec_set_dimensions(avctx, s->width, s->height);
s->has_alpha = get_bits1(&s->gb);