summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-03-24 20:55:30 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-29 14:23:41 +0200
commitcb7809cc4d6b1b47e936d2e94b21f4e41850ffaf (patch)
treea6f288841a54a15039b305515c1c62b9e93644d8
parent42fc190ab051f121a15e6a826e8cfabd7303966b (diff)
downloadffmpeg-cb7809cc4d6b1b47e936d2e94b21f4e41850ffaf.tar.gz
avcodec/libutvideodec: copy frame so it has reference counters when refcounted_frames is set
Reviewed-by: maintainer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0cd9ff4e3aa23318a855c21d60b1c9035b2b99d2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/libutvideodec.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/libutvideodec.cpp b/libavcodec/libutvideodec.cpp
index e4b87a8bbc..93fbcb4a51 100644
--- a/libavcodec/libutvideodec.cpp
+++ b/libavcodec/libutvideodec.cpp
@@ -222,9 +222,19 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data,
pic->data[0] = utv->buffer + utv->buf_size + pic->linesize[0];
break;
}
+ pic->width = w;
+ pic->height = h;
+ pic->format = avctx->pix_fmt;
+
+ if (avctx->refcounted_frames) {
+ int ret = av_frame_ref((AVFrame*)data, pic);
+ if (ret < 0)
+ return ret;
+ } else {
+ av_frame_move_ref((AVFrame*)data, pic);
+ }
*got_frame = 1;
- av_frame_move_ref((AVFrame*)data, pic);
return avpkt->size;
}