Michael Niedermayer a897ba33e8 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>

2013-11-01 15:25:09 +01:00

8.2 KiB

Raw Blame History

View Raw