diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
| commit | 64a0ed190efa4c8d1514a7d258ab533b340408d8 (patch) | |
| tree | 9574586d8083d3a2184b221c3a15d697020f8844 /libavcodec/dnxhddec.c | |
| parent | bf92cd8178e0553a27971118e2b2b9e87e7b810b (diff) | |
| parent | 13207484bba8a8b78b40d5a22da8c9c555429089 (diff) | |
| download | ffmpeg-64a0ed190efa4c8d1514a7d258ab533b340408d8.tar.gz | |
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
mpeg4video_parser: stop using deprecated avcodec_set_dimensions
mpeg12dec: stop using deprecated avcodec_set_dimensions
mjpegdec: stop using deprecated avcodec_set_dimensions
libvpxdec: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
0 files changed, 0 insertions, 0 deletions