Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:49:58 +0000 (15:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:49:58 +0000 (15:49 +0100)
commit98ca3fb9cf7fdfad38e731ffb029fa3f96b94581
treef1cec553a2ad4be7135cc63adc061bc234f38c64
parentffd100b111f4d494a9d70dae0efef0307eaf84d8
parent757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be
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@gmx.at>
libavcodec/truemotion1.c
libavcodec/txd.c
libavcodec/vp3.c
libavcodec/vp5.c
libavcodec/vp56.c
libavcodec/vp6.c
libavcodec/vp8.c