Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:43:29 +0000 (15:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:43:29 +0000 (15:43 +0100)
commitffd100b111f4d494a9d70dae0efef0307eaf84d8
treeea85fc5a2a9976982f18bd26b3d96ff352a402c6
parent7630e564caaef008ae255c3b63ac725131073b6f
parentc265b8bb7638546919465e3585441b1d40c4b13d
Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'

* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/sunrast.c
libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sunrast.c
libavcodec/svq1dec.c
libavcodec/targa.c
libavcodec/tiff.c