Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:14:52 +0000 (15:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:14:52 +0000 (15:14 +0100)
commit64a0ed190efa4c8d1514a7d258ab533b340408d8
tree9574586d8083d3a2184b221c3a15d697020f8844
parentbf92cd8178e0553a27971118e2b2b9e87e7b810b
parent13207484bba8a8b78b40d5a22da8c9c555429089
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'

* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libvpxdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c