diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:45:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:45:25 +0100 |
| commit | f03cdbd0454fbdba53a123a8f95186a519fade8d (patch) | |
| tree | c7386c765f42c684b931dcefb6382d4aadf43e5a /libavcodec/g726.c | |
| parent | d13f434dbb55348b3ed761e4f4c2ff9c7be4ea4b (diff) | |
| parent | 5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20 (diff) | |
| download | ffmpeg-f03cdbd0454fbdba53a123a8f95186a519fade8d.tar.gz | |
Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'
* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
binkaudio: decode directly to the user-provided AVFrame
atrac3: decode directly to the user-provided AVFrame
atrac1: decode directly to the user-provided AVFrame
ape: decode directly to the user-provided AVFrame
amrwb: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/amrwbdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions