diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:28:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:28:27 +0100 |
commit | 08059f6150fcf75d884670cdbdbdf8830fa199bd (patch) | |
tree | 3e3c42784e6b34b0de16fa3fad2fbd852f59137c /libavcodec/ra144.h | |
parent | 65da7007043cf4fb99b72c7f823cfc15e429b45f (diff) | |
parent | 5d5c248c3df30fa91a8dde639618c985b9a11c53 (diff) | |
download | ffmpeg-08059f6150fcf75d884670cdbdbdf8830fa199bd.tar.gz |
Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'
* commit '5d5c248c3df30fa91a8dde639618c985b9a11c53':
s302m: decode directly to the user-provided AVFrame
ra288: decode directly to the user-provided AVFrame
ra144: decode directly to the user-provided AVFrame
ralf: decode directly to the user-provided AVFrame
qdm2: decode directly to the user-provided AVFrame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra144.h')
-rw-r--r-- | libavcodec/ra144.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index 331dc35f3c..eb893988fb 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -35,7 +35,6 @@ typedef struct RA144Context { AVCodecContext *avctx; - AVFrame frame; LPCContext lpc_ctx; AudioFrameQueue afq; int last_frame; |