Michael Niedermayer ffd100b111 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>

2013-11-01 15:43:29 +01:00

6.6 KiB

Raw Blame History

View Raw