diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:31:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:31:32 +0100 |
| commit | 92cbd775687204f9750a09c69f97702719036aab (patch) | |
| tree | 16a375879e56045652edd2dd8f604bb7fb2fb4d0 /libavresample/x86/audio_mix.asm | |
| parent | 9ad477d9098b5281cede0bd8525ca90b0e52436d (diff) | |
| parent | d48c20630214a4effcc920e93a5044bee4e2002e (diff) | |
| download | ffmpeg-92cbd775687204f9750a09c69f97702719036aab.tar.gz | |
Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'
* commit 'd48c20630214a4effcc920e93a5044bee4e2002e':
qtrleenc: use the AVFrame API properly.
ulti: use the AVFrame API properly.
vc1: use the AVFrame API properly.
flashsv: use the AVFrame API properly.
Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/audio_mix.asm')
0 files changed, 0 insertions, 0 deletions