diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:57:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 14:23:01 +0100 |
| commit | 80d44190c4d909e9685d04bcde693da3e2441dfd (patch) | |
| tree | 38024d00022c9e8dd2c15c1b82765b8392c2c42d /libavresample/audio_mix.c | |
| parent | d1134ababdbd55ef0330c09deccfb32daaa809b5 (diff) | |
| parent | adb199d1bc7f86aa6b85986f40190ec17f99d34f (diff) | |
| download | ffmpeg-80d44190c4d909e9685d04bcde693da3e2441dfd.tar.gz | |
Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'
* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
kgv1dec: replace forcing EMU_EDGE by a copy
Conflicts:
libavcodec/kgv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions