Merge commit '759001c534287a96dc96d1e274665feb7059145d'

[ffmpeg.git] / libavcodec / avrndec.c

diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c
index 0fc431d..882ee50 100644 (file)
--- a/libavcodec/avrndec.c
+++ b/libavcodec/avrndec.c
@@ -27,7 +27,6 @@
 
 typedef struct {
     MJpegDecodeContext mjpeg_ctx;
-    AVFrame frame;
     int is_mjpeg;
     int interlace; //FIXME use frame.interlaced_frame
     int tff;
@@ -52,7 +51,6 @@ static av_cold int init(AVCodecContext *avctx)
     if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
         return ret;
 
-    avcodec_get_frame_defaults(&a->frame);
     avctx->pix_fmt = AV_PIX_FMT_UYVY422;
 
     if(avctx->extradata_size >= 9 && avctx->extradata[4]+28 < avctx->extradata_size) {
@@ -69,10 +67,6 @@ static av_cold int init(AVCodecContext *avctx)
 static av_cold int end(AVCodecContext *avctx)
 {
     AVRnContext *a = avctx->priv_data;
-    AVFrame *p = &a->frame;
-
-    if(p->data[0])
-        avctx->release_buffer(avctx, p);
 
     if(a->is_mjpeg)
         ff_mjpeg_decode_end(avctx);
@@ -84,7 +78,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
                         int *got_frame, AVPacket *avpkt)
 {
     AVRnContext *a = avctx->priv_data;
-    AVFrame *p = &a->frame;
+    AVFrame *p = data;
     const uint8_t *buf = avpkt->data;
     int buf_size       = avpkt->size;
     int y, ret, true_height;
@@ -93,15 +87,13 @@ static int decode_frame(AVCodecContext *avctx, void *data,
         return ff_mjpeg_decode_frame(avctx, data, got_frame, avpkt);
 
     true_height    = buf_size / (2*avctx->width);
-    if(p->data[0])
-        avctx->release_buffer(avctx, p);
 
     if(buf_size < 2*avctx->width * avctx->height) {
         av_log(avctx, AV_LOG_ERROR, "packet too small\n");
         return AVERROR_INVALIDDATA;
     }
 
-    if((ret = ff_get_buffer(avctx, p)) < 0){
+    if((ret = ff_get_buffer(avctx, p, 0)) < 0){
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -123,7 +115,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
         }
     }
 
-    *(AVFrame*)data = a->frame;
     *got_frame      = 1;
     return buf_size;
 }