[FFmpeg-cvslog] Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 15:14:52 2013 +0100| [64a0ed190efa4c8d1514a7d258ab533b340408d8] | committer: Michael Niedermayer

Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'

* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4video_parser.c

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

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