From patchwork Sat Jun 15 17:13:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13543 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 64F00449D53 for ; Sat, 15 Jun 2019 20:13:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4074168A3D3; Sat, 15 Jun 2019 20:13:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A61D7689F2B for ; Sat, 15 Jun 2019 20:13:47 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id v11so3376893pgl.5 for ; Sat, 15 Jun 2019 10:13:47 -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=qyXy5Fqq376q1fXgZgSjfScgWrdxNnDl9BV5Oc22t70=; b=Rs0da/5+3zqNI6RQVTs7bi/93h/nX9tTTDVYusBRTR0hxRwNQfwkDm+z1x5ES/M4/B Ico039vvn6ChTYfQWfz6m/FwjENZBZbNDawR5bnucxhOmbH4byUYp43lf5nxx1liI7sz 8NNX9tppLOjKF+GZl96OXEuvyJ5YDd9OviPU5Rgp0ssUdJopjwFT7BOaovBg1fetYtVQ DI9qzAI/FZ8TVh2vTvgc6IHZ4K+nZToZbb+6SDMnUwxDTOD8hYyNxUj6zb9p7KGadEFl 16V9a5W3IhtW9zcGXZBfiqmK6noI84+QWGwUbbiOvAr7dMcAuKpTqSKr20hObuIs04fG mlTw== 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=qyXy5Fqq376q1fXgZgSjfScgWrdxNnDl9BV5Oc22t70=; b=XTjbzLszBAqsoF5D+g+qizPB0IH9eSjJmPnz7N7URrOMGd05tVcCe1zcNzulIfvvMT EkYN4FqTqZ2dKbq1GCqX0kFtRxU4BUtYVhfD/C+QGtaO+wXY6AaDaZimGPaHFJsgJ7cK Ms7Q+BPvhoJowR/JgKHMsLKSPjjMqL3Pyzstggk6mC64d2yzCP22yN5vXt39Ump+f8k/ fe9158d/oDNWlPQAHvbJk9VcY2+hYBvr3EbPxRlRmlMEAY2Wjl+ScXvVmr1C/guL4OCg 4ki5LaU/jW/U9f/yvegK9q3UmLAgmQAXArzSupehPcBpVwIpkXNMBmhuDk30G/Wc+2LV BKMQ== X-Gm-Message-State: APjAAAV9iksNTPJTUnFDZO2N1gDuhYx76MTZnoNVZ/MOursJ902YPH3D KQrNruFK4Ms0dwFpRB9w+YVuk1bY X-Google-Smtp-Source: APXvYqx9G7O7VRNuSyUsiLd3y+Me248Elj/0APrWIbdN4+cRObAGpmt5P21oGktAgXARSdOHpLNSZg== X-Received: by 2002:a17:90a:3ae8:: with SMTP id b95mr16869801pjc.68.1560618825615; Sat, 15 Jun 2019 10:13:45 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m31sm15421324pjb.6.2019.06.15.10.13.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jun 2019 10:13:44 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2019 01:13:36 +0800 Message-Id: <1560618818-14485-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/3] lavf/mpegtsenc: fix logic check error 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix the logic check error Signed-off-by: Jun Zhao --- libavformat/mpegtsenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index fc0ea22..5d679c9 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1651,7 +1651,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) } while (p < buf_end && (state & 0x7e) != 2*35 && (state & 0x7e) >= 2*32); - if ((state & 0x7e) < 2*16 && (state & 0x7e) >= 2*24) + if ((state & 0x7e) < 2*16 || (state & 0x7e) >= 2*24) extradd = 0; if ((state & 0x7e) != 2*35) { // AUD NAL data = av_malloc(pkt->size + 7 + extradd);