diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
commit | bf92cd8178e0553a27971118e2b2b9e87e7b810b (patch) | |
tree | 3cab52ceebfa519d6a8eaccc123e81bcab48f45f /libavcodec/pgssubdec.c | |
parent | e6b9d71ad9569b5d033058958da5155100ada1ab (diff) | |
parent | 967cd6fafbf2fdec9cbe011296ad34a70212427e (diff) | |
download | ffmpeg-bf92cd8178e0553a27971118e2b2b9e87e7b810b.tar.gz |
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>
Diffstat (limited to 'libavcodec/pgssubdec.c')
0 files changed, 0 insertions, 0 deletions