aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-13 12:14:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-13 12:14:46 +0100
commitafe30fe0600824b0dcda8318f09a5a4e376b99c3 (patch)
tree06921b98421767cea958eed3943b10fb71e4997d /libavutil
parent5459cf411412c7a1d2da7ce6a6955c7d57490a55 (diff)
parent86bfcfcf2364bc837b7bb582c66a8a15a332414f (diff)
downloadffmpeg-afe30fe0600824b0dcda8318f09a5a4e376b99c3.tar.gz
Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f': mace: decode directly to the user-provided AVFrame libspeex: decode directly to the user-provided AVFrame libopus: decode directly to the user-provided AVFrame libopencore-amr: decode directly to the user-provided AVFrame libgsm: decode directly to the user-provided AVFrame Conflicts: libavcodec/libopusdec.c libavcodec/mace.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions