[FFmpeg-cvslog] Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 15:07:25 2013 +0100| [bf92cd8178e0553a27971118e2b2b9e87e7b810b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf92cd8178e0553a27971118e2b2b9e87e7b810b
---