diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
commit | bf688d23b5ff63395e4acf46b5d7fd5e610aab96 (patch) | |
tree | ee2a25164d980386ac49455a96b0b1aa947955ec /libswscale | |
parent | 4a356512676629b4a289ea33f2b39b5f151cfae3 (diff) | |
parent | ec7063005ee67c0b4d4b83aa5118dd22ad1094e8 (diff) | |
download | ffmpeg-bf688d23b5ff63395e4acf46b5d7fd5e610aab96.tar.gz |
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
eatqi: stop using deprecated avcodec_set_dimensions
eatgv: stop using deprecated avcodec_set_dimensions
eatgq: stop using deprecated avcodec_set_dimensions
eamad: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions