Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:07:25 +0000 (15:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:07:25 +0000 (15:07 +0100)
commitbf92cd8178e0553a27971118e2b2b9e87e7b810b
tree3cab52ceebfa519d6a8eaccc123e81bcab48f45f
parente6b9d71ad9569b5d033058958da5155100ada1ab
parent967cd6fafbf2fdec9cbe011296ad34a70212427e
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>
libavcodec/indeo3.c
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c