diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:35:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:35:37 +0100 |
| commit | 2becf21d9fd841962f87ad4e273274ee81a35bad (patch) | |
| tree | 69b350cf5d5fc530698b6981442f1af89b221fac /libavcodec/sipr.h | |
| parent | 08059f6150fcf75d884670cdbdbdf8830fa199bd (diff) | |
| parent | 4a2b26fc1b1ad123eba473a20e270f2b0ba92bca (diff) | |
| download | ffmpeg-2becf21d9fd841962f87ad4e273274ee81a35bad.tar.gz | |
Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'
* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
tak: decode directly to the user-provided AVFrame
smackaud: decode directly to the user-provided AVFrame
sipr: decode directly to the user-provided AVFrame
shorten: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/shorten.c
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.h')
| -rw-r--r-- | libavcodec/sipr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index 8872fa326e..83bb0b340b 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -65,7 +65,6 @@ typedef struct SiprParameters { typedef struct SiprContext { AVCodecContext *avctx; - AVFrame frame; SiprMode mode; |