Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 13:01:02 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 13:01:02 +0000 (14:01 +0100)
commit4a356512676629b4a289ea33f2b39b5f151cfae3
treec4391d9281d285e0c5c53a4000a3918de7dbaf31
parentf016a23c7fa0b089a394e25eeefa5d5f4d99d926
parentd6da372984c87fd6288c148c291065d6032ceda3
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@gmx.at>
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c