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>

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;