diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:42:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:42:14 +0100 |
| commit | dca6fb08a71b8201f0a32f9cff18e7753355733a (patch) | |
| tree | 010719ea90db7d04612fcdd871870119ecb04cfb /libavcodec/wmadec.c | |
| parent | 2becf21d9fd841962f87ad4e273274ee81a35bad (diff) | |
| parent | ee6ca11b657515ad736ec0d2b8635e098d0a2680 (diff) | |
| download | ffmpeg-dca6fb08a71b8201f0a32f9cff18e7753355733a.tar.gz | |
Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'
* commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680':
vorbis: decode directly to the user-provided AVFrame
vmdaudio: decode directly to the user-provided AVFrame
twinvq: decode directly to the user-provided AVFrame
tta: decode directly to the user-provided AVFrame
truespeech: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/tta.c
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
0 files changed, 0 insertions, 0 deletions