Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'

[ffmpeg] / libavcodec / cavsdec.c

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index cf86ab4c96fa7798e90c185a69a35c57a90704d8..cdcdccbd9c21d1869feb3a1361f68d3fb2802cca 100644 (file)
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -966,7 +966,8 @@ static int decode_pic(AVSContext *h) {
 
     if ((ret = ff_get_buffer(s->avctx, &h->picture.f)) < 0)
         return ret;
-    ff_cavs_init_pic(h);
+    if ((ret = ff_cavs_init_pic(h)) < 0)
+        return ret;
     h->picture.poc = get_bits(&s->gb,8)*2;
 
     /* get temporal distances and MV scaling factors */