| commit | afe30fe0600824b0dcda8318f09a5a4e376b99c3 | [log] [tgz] |
|---|---|---|
| author | Michael Niedermayer <[email protected]> | Wed Feb 13 11:14:46 2013 |
| committer | Michael Niedermayer <[email protected]> | Wed Feb 13 11:14:46 2013 |
| tree | 06921b98421767cea958eed3943b10fb71e4997d | |
| parent | 5459cf411412c7a1d2da7ce6a6955c7d57490a55 [diff] | |
| parent | 86bfcfcf2364bc837b7bb582c66a8a15a332414f [diff] |
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 <[email protected]>