[FFmpeg-cvslog] Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 15:25:09 2013 +0100| [a897ba33e88316d2591a89ab93f8f69587d245ca] | committer: Michael Niedermayer

Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'

* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/pcx.c
	libavcodec/pgssubdec.c
	libavcodec/pictordec.c

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

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