diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 14:18:55 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 14:27:54 +0400 |
| commit | 4789955ec4260f9e8f99b8d774ada2ad679d5630 (patch) | |
| tree | b94dfe29f21daf81a3fe5d759e093c26de7be7e3 /libavcodec/aac.h | |
| parent | 2acd5fb5532587507ab197788338ae55bf9128aa (diff) | |
| parent | e57daa876bf0cf50782550e366e589441cd8c2bd (diff) | |
Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'
* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
adpcm: decode directly to the user-provided AVFrame
ac3: decode directly to the user-provided AVFrame
aac: decode directly to the user-provided AVFrame
8svx: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/8svx.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index d17366c8ee..9f72a3d291 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -265,7 +265,7 @@ typedef struct AACContext AACContext; struct AACContext { AVClass *class; AVCodecContext *avctx; - AVFrame frame; + AVFrame *frame; int is_saved; ///< Set if elements have stored overlap from previous frame. DynamicRangeControl che_drc; |