pgssubdec: fix API compability layer
authorPetri Hintukainen <phintuka@gmail.com>
Thu, 26 Nov 2015 08:33:42 +0000 (10:33 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Thu, 26 Nov 2015 09:55:36 +0000 (10:55 +0100)
Copy pointers to AVPicture after memory has been allocated.
Fixes NULL pointers in AVPicture after a17a7661906ba295d67afd80ac0770422e1b02b3.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/pgssubdec.c

index d58b491..7bcb1ed 100644 (file)
@@ -543,16 +543,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
 
         sub->rects[i]->linesize[0] = object->w;
 
-#if FF_API_AVPICTURE
-FF_DISABLE_DEPRECATION_WARNINGS
-        rect = sub->rects[i];
-        for (j = 0; j < 4; j++) {
-            rect->pict.data[j] = rect->data[j];
-            rect->pict.linesize[j] = rect->linesize[j];
-        }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
         if (object->rle) {
             if (object->rle_remaining_len) {
                 av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes shorter than expected\n",
@@ -582,6 +572,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
             return AVERROR(ENOMEM);
         }
 
+#if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
+        rect = sub->rects[i];
+        for (j = 0; j < 4; j++) {
+            rect->pict.data[j] = rect->data[j];
+            rect->pict.linesize[j] = rect->linesize[j];
+        }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
         memcpy(sub->rects[i]->data[1], palette->clut, sub->rects[i]->nb_colors * sizeof(uint32_t));
 
     }