[FFmpeg-cvslog] Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 14:01:02 2013 +0100| [4a356512676629b4a289ea33f2b39b5f151cfae3] | committer: Michael Niedermayer

Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'

* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/eacmv.c

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

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