roqaudio: Always use the frame buffer on flush
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Nov 2014 10:13:10 +0000 (11:13 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 24 Nov 2014 01:30:15 +0000 (01:30 +0000)
Prevent NULL dereference.

CC: libav-stable@libav.org
Bug-Id: CID 703669
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/roqaudioenc.c

index f97d5d6..402eb78 100644 (file)
@@ -147,15 +147,16 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
             context->input_frames++;
             return 0;
         }
-        in = context->frame_buffer;
     }
+    if (context->input_frames < 8)
+        in = context->frame_buffer;
 
     if (stereo) {
         context->lastSample[0] &= 0xFF00;
         context->lastSample[1] &= 0xFF00;
     }
 
-    if (context->input_frames == 7 || !in)
+    if (context->input_frames == 7)
         data_size = avctx->channels * context->buffered_samples;
     else
         data_size = avctx->channels * avctx->frame_size;