Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:55:55 +0000 (15:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:55:58 +0000 (15:55 +0100)
* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
  webp: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/webp.c

Simple merge