diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:36:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 11:39:05 +0100 |
| commit | d13f434dbb55348b3ed761e4f4c2ff9c7be4ea4b (patch) | |
| tree | 6591e3d29559c2dacdea43049b128790993be84c /libavcodec/atrac3.c | |
| parent | 4789955ec4260f9e8f99b8d774ada2ad679d5630 (diff) | |
| parent | e3db34291f4401a16f6ac92721617a9f33cd4c31 (diff) | |
Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31'
* commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31':
amrnb: decode directly to the user-provided AVFrame
als: decode directly to the user-provided AVFrame
alac: decode directly to the user-provided AVFrame
adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
adx: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/alsdec.c
libavcodec/amrnbdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3.c')
0 files changed, 0 insertions, 0 deletions