libtwolame: prevent a NULL pointer dereference
authorVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 21 Nov 2014 11:56:59 +0000 (11:56 +0000)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 21 Nov 2014 12:27:07 +0000 (12:27 +0000)
CC: libav-stable@libav.org
Bug-Id: CID 1250330 / CID 1250335

libavcodec/libtwolame.c

index 400985a..ce32941 100644 (file)
@@ -148,8 +148,8 @@ static int twolame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     if (ret < 0)  // twolame error
         return AVERROR_UNKNOWN;
 
-    avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);
     if (frame) {
+        avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);
         if (frame->pts != AV_NOPTS_VALUE)
             avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->initial_padding);
     } else {