Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:25:09 +0000 (15:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:25:09 +0000 (15:25 +0100)
commita897ba33e88316d2591a89ab93f8f69587d245ca
tree0286276ca6dd54107f8f9db82e8277a59d3f1955
parent64a0ed190efa4c8d1514a7d258ab533b340408d8
parent0f21d8b1b40848973558c737aebe800c46e93a3d
Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'

* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo_parser.c
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c