diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
| commit | 98ca3fb9cf7fdfad38e731ffb029fa3f96b94581 (patch) | |
| tree | f1cec553a2ad4be7135cc63adc061bc234f38c64 /COPYING.GPLv3 | |
| parent | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (diff) | |
| parent | 757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be (diff) | |
| download | ffmpeg-98ca3fb9cf7fdfad38e731ffb029fa3f96b94581.tar.gz | |
Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
vp8: stop using deprecated avcodec_set_dimensions
vp56: stop using deprecated avcodec_set_dimensions
vp3: stop using deprecated avcodec_set_dimensions
txd: stop using deprecated avcodec_set_dimensions
truemotion1: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/txd.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions