diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:49:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:49:48 +0100 |
| commit | 0dff771f31cffffec0e16944d3890564c2da16eb (patch) | |
| tree | 6c6ab0759ebf48fd5a7a478f97fb2110b4c5ad6e /libavcodec/wma.h | |
| parent | dca6fb08a71b8201f0a32f9cff18e7753355733a (diff) | |
| parent | 205a95f7b5178362874bc1e65eae9866723491c1 (diff) | |
Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'
* commit '205a95f7b5178362874bc1e65eae9866723491c1':
wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
wma: decode directly to the user-provided AVFrame
wmapro: decode directly to the user-provided AVFrame
wavpack: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.h')
| -rw-r--r-- | libavcodec/wma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 36c6e55e46..f865ccab4d 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -66,7 +66,6 @@ typedef struct CoefVLCTable { typedef struct WMACodecContext { AVCodecContext* avctx; - AVFrame frame; GetBitContext gb; PutBitContext pb; int version; ///< 1 = 0x160 (WMAV1), 2 = 0x161 (WMAV2) |