diff mbox

[FFmpeg-devel,3/5] avcodec/tscc: Move reading the side data palette before other checks

Message ID 20180715131341.28705-3-michael@niedermayer.cc
State Accepted
Commit 679bfa453f60e61178cc93cb85d2b272ccd23fea
Headers show

Commit Message

Michael Niedermayer July 15, 2018, 1:13 p.m. UTC 
We do not want to loose the side data in case of errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/tscc.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

Comments

Michael Niedermayer July 23, 2018, 12:38 a.m. UTC | #1 
On Sun, Jul 15, 2018 at 03:13:39PM +0200, Michael Niedermayer wrote:
> We do not want to loose the side data in case of errors
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/tscc.c | 23 ++++++++++++++---------
>  1 file changed, 14 insertions(+), 9 deletions(-)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index f891932342..fc9510451b 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -69,6 +69,19 @@  static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     CamtasiaContext * const c = avctx->priv_data;
     AVFrame *frame = c->frame;
     int ret;
+    int palette_has_changed = 0;
+
+    if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
+        int size;
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
+
+        if (pal && size == AVPALETTE_SIZE) {
+            palette_has_changed = 1;
+            memcpy(c->pal, pal, AVPALETTE_SIZE);
+        } else if (pal) {
+            av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
+        }
+    }
 
     ret = inflateReset(&c->zstream);
     if (ret != Z_OK) {
@@ -97,15 +110,7 @@  static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 
     /* make the palette available on the way out */
     if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
-        int size;
-        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
-
-        if (pal && size == AVPALETTE_SIZE) {
-            frame->palette_has_changed = 1;
-            memcpy(c->pal, pal, AVPALETTE_SIZE);
-        } else if (pal) {
-            av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
-        }
+        frame->palette_has_changed = palette_has_changed;
         memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
     }