diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:53:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:53:23 +0100 |
| commit | 0a5138695aa441ab341b2f00d946c239db69edbf (patch) | |
| tree | 900049ab4690d9511ae2ccad787e0000694529cb /libavutil/arm/cpu.h | |
| parent | f03cdbd0454fbdba53a123a8f95186a519fade8d (diff) | |
| parent | 182821cff43f5f977004d105b86c47ceb20d00d6 (diff) | |
| download | ffmpeg-0a5138695aa441ab341b2f00d946c239db69edbf.tar.gz | |
Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'
* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
dca: decode directly to the user-provided AVFrame
cook: decode directly to the user-provided AVFrame
comfortnoise: decode directly to the user-provided AVFrame
bmvaudio: decode directly to the user-provided AVFrame
pcm: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/cpu.h')
0 files changed, 0 insertions, 0 deletions