[FFmpeg-cvslog] Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'

[Michael Niedermayer]

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

Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'

* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/txd.c
	libavcodec/vp56.c

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

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