diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:59:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:59:51 +0100 |
| commit | d88e674a15dc23ca6bb68173dbb7c12e5d668bb5 (patch) | |
| tree | 0a7d58e61ea7e3e3e692731f7a4e1e119f197689 /libavresample/audio_mix.c | |
| parent | 0a5138695aa441ab341b2f00d946c239db69edbf (diff) | |
| parent | cb7b47a61dba0b9329ecede5dd3211dc0662dc05 (diff) | |
| download | ffmpeg-d88e674a15dc23ca6bb68173dbb7c12e5d668bb5.tar.gz | |
Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'
* commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05':
g726: decode directly to the user-provided AVFrame
g723.1: decode directly to the user-provided AVFrame
g722: decode directly to the user-provided AVFrame
flac: decode directly to the user-provided AVFrame
cinaudio: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/g723_1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions