From patchwork Mon Apr 3 20:13:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 3275 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp240564vss; Mon, 3 Apr 2017 13:21:06 -0700 (PDT) X-Received: by 10.223.169.113 with SMTP id u104mr15914041wrc.168.1491250866877; Mon, 03 Apr 2017 13:21:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q63si1064701wmd.78.2017.04.03.13.21.06; Mon, 03 Apr 2017 13:21:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C71A46806A5; Mon, 3 Apr 2017 23:21:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE6A76806A5 for ; Mon, 3 Apr 2017 23:20:55 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id u18so36621045wrc.0 for ; Mon, 03 Apr 2017 13:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=94jDhYVya6HqbL3opumPvLQ5ovBA3/zq8QcSVQBD+tY=; b=KPOqT4l7XCEMvGgenwfO/K8QVcM6IRfToBLzt8UWfhKkGfUH5+WQa3RGF8TFCpLGy0 agVbS4FUkczXUTfjRMGe3T2cnTnaHKYvqprNjGmpsNq4rFxpzEr4tvScBFKIWEJq1ZR2 ET3cgfF1cROuZYW2OBQRmDmd9AQXym0k+0VRlYBx7epFNSSxdHTKSoNIS3dClJKYPU7c zKd9//IZqxfm7+aIpCa4Ghd2ommYby+G/VpPh5hxnAzWFNuIb4RZREkH8up/uEkcBCte FOArQzBnx37e4Bfk/VjxFU14ElynuytQopoZ2uKwasxKjzAQZdUOMM9WW2NJG2OHGH0V Dy5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=94jDhYVya6HqbL3opumPvLQ5ovBA3/zq8QcSVQBD+tY=; b=h2MMicFc1TFKuGK4jMiYrxjfKoy2FohGLaRFh5m3/YE6nRhISrHK4Jfi6X+LZ+WKKp IodQnZqfr7zoK0qHSdK0AGAVDAmlXdeTFDIcmP8tEdlKh9cL8eWCFrr2+xtIASDaoBh/ qr18iA5VoNT4GlwoZMTAEbHlmOQdftLLpgcxg5iagbsnlhGWVtCiwCm+fwFqYzjr7BVL KHtUjUlqxbPCojKDX/5gcWsFuw2593o/vblj3ENMmryqlFhC1ntySLjsXbSTYLbBRc+F c72AtBNXeo/99mbh859aSjangIKNCV665fiy4XmT+LxfLI+9uLU2H8i1qV4J+AjHY3RZ dsnw== X-Gm-Message-State: AFeK/H2FIH91QIRNe9eajVM1Z7YY2V6vXKCndTrbWapLgOEMnrxH9lsQ xZjbQECuPKMx6Q== X-Received: by 10.28.154.14 with SMTP id c14mr11109219wme.75.1491250418322; Mon, 03 Apr 2017 13:13:38 -0700 (PDT) Received: from moonbase.lan (host86-136-239-66.range86-136.btcentralplus.com. [86.136.239.66]) by smtp.gmail.com with ESMTPSA id 201sm15651802wmr.5.2017.04.03.13.13.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 13:13:37 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Apr 2017 21:13:28 +0100 Message-Id: <20170403201330.44240-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.12.2.564.g063fe858b8 Subject: [FFmpeg-devel] [PATCH 1/3] mjpegenc_common: check for codec ID before using avctx->priv_data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When coding lossless jpeg the priv context will be pointing to LJpegEncContext rather than MpegEncContext, which the function expects. Signed-off-by: Rostislav Pehlivanov --- libavcodec/mjpegenc_common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 83a9e95766..6d9c982726 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -91,13 +91,17 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, { int i, j, size; uint8_t *ptr; - MpegEncContext *s = avctx->priv_data; + MpegEncContext *s = NULL; + + /* Since avctx->priv_data will point to LJpegEncContext in this case */ + if (avctx->codec_id != AV_CODEC_ID_LJPEG) + s = avctx->priv_data; if (avctx->codec_id != AV_CODEC_ID_LJPEG) { int matrix_count = 1 + !!memcmp(luma_intra_matrix, chroma_intra_matrix, sizeof(luma_intra_matrix[0]) * 64); - if (s->force_duplicated_matrix) + if (s && s->force_duplicated_matrix) matrix_count = 2; /* quant matrixes */ put_marker(p, DQT); @@ -134,7 +138,7 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, // Only MJPEG can have a variable Huffman variable. All other // formats use the default Huffman table. - if (s->out_format == FMT_MJPEG && s->huffman == HUFFMAN_TABLE_OPTIMAL) { + if (s && s->huffman == HUFFMAN_TABLE_OPTIMAL) { size += put_huffman_table(p, 0, 0, s->mjpeg_ctx->bits_dc_luminance, s->mjpeg_ctx->val_dc_luminance); size += put_huffman_table(p, 0, 1, s->mjpeg_ctx->bits_dc_chrominance,