Merge commit '60f50374f1955442dc987abc4a6c61c2109620c2'

* commit '60f50374f1955442dc987abc4a6c61c2109620c2':
  rpza: Check the blocks left before processing one

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/rpza.c
index 5faf562,d1c959d..315ad23
--- 1/libavcodec/rpza.c
--- 2/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@@ -248,10 -252,14 +256,12 @@@ static int rpza_decode_frame(AVCodecCon
  
      bytestream2_init(&s->gb, avpkt->data, avpkt->size);
  
 -    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 +    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
          return ret;
 -    }
  
-     rpza_decode_stream(s);
+     ret = rpza_decode_stream(s);
+     if (ret < 0)
+         return ret;
  
      if ((ret = av_frame_ref(data, s->frame)) < 0)
          return ret;