Michael Niedermayer bf92cd8178 Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e' ...

* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/kgv1dec.c
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

14 KiB

Raw Blame History

View Raw