h264: fix bit depth changes with frame threading

[ffmpeg] / libavcodec / ra144dec.c

diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index d3c81ca6a15ffa3990c64fbc11a9a397b58377ff..15162c30b2e3cebd00977c70eb34ffe569e4283c 100644 (file)
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -76,20 +76,21 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
     RA144Context *ractx = avctx->priv_data;
     GetBitContext gb;
 
+    if (buf_size < FRAMESIZE) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Frame too small (%d bytes). Truncated file?\n", buf_size);
+        *got_frame_ptr = 0;
+        return AVERROR_INVALIDDATA;
+    }
+
     /* get output buffer */
     frame->nb_samples = NBLOCKS * BLOCKSIZE;
-    if ((ret = ff_get_buffer(avctx, frame)) < 0) {
+    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
     samples = (int16_t *)frame->data[0];
 
-    if(buf_size < FRAMESIZE) {
-        av_log(avctx, AV_LOG_ERROR,
-               "Frame too small (%d bytes). Truncated file?\n", buf_size);
-        *got_frame_ptr = 0;
-        return buf_size;
-    }
     init_get_bits(&gb, buf, FRAMESIZE * 8);
 
     for (i = 0; i < LPC_ORDER; i++)