Browse code

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>

Michael Niedermayer authored on 2016/03/25 04:55:30
Showing 1 changed files
... ...
@@ -222,9 +222,19 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data,
222 222
         pic->data[0] = utv->buffer + utv->buf_size + pic->linesize[0];
223 223
         break;
224 224
     }
225
+    pic->width  = w;
226
+    pic->height = h;
227
+    pic->format = avctx->pix_fmt;
228
+
229
+    if (avctx->refcounted_frames) {
230
+        int ret = av_frame_ref((AVFrame*)data, pic);
231
+        if (ret < 0)
232
+             return ret;
233
+    } else {
234
+        av_frame_move_ref((AVFrame*)data, pic);
235
+    }
225 236
 
226 237
     *got_frame = 1;
227
-    av_frame_move_ref((AVFrame*)data, pic);
228 238
 
229 239
     return avpkt->size;
230 240
 }