[FFmpeg-cvslog] Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 15:34:49 2013 +0100| [7630e564caaef008ae255c3b63ac725131073b6f] | committer: Michael Niedermayer

Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ptx.c
	libavcodec/rv10.c
	libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7630e564caaef008ae255c3b63ac725131073b6f
---