diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
| commit | 7630e564caaef008ae255c3b63ac725131073b6f (patch) | |
| tree | 28d00107374434d841637f6a299446d1e7122f72 /libavcodec/svq1dec.c | |
| parent | a897ba33e88316d2591a89ab93f8f69587d245ca (diff) | |
| parent | c755870d52c8c29676e5ba7ee9557adf4a7ca934 (diff) | |
| download | ffmpeg-7630e564caaef008ae255c3b63ac725131073b6f.tar.gz | |
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
sgidec: stop using deprecated avcodec_set_dimensions
rv34: stop using deprecated avcodec_set_dimensions
rv10: stop using deprecated avcodec_set_dimensions
ptx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1dec.c')
0 files changed, 0 insertions, 0 deletions