Module: libav Branch: release/11 Commit: 4d11e4b47db6387077682595d53e9a17b50511cb
Author: Vittorio Giovara <[email protected]> Committer: Luca Barbato <[email protected]> Date: Fri Nov 21 11:56:59 2014 +0000 libtwolame: prevent a NULL pointer dereference CC: [email protected] Bug-Id: CID 1250330 / CID 1250335 (cherry picked from commit a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b) Signed-off-by: Luca Barbato <[email protected]> --- libavcodec/libtwolame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index def5fee..7f7b2f7 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -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->delay); } else { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
