From patchwork Sun Sep 25 19:43:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 719 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1578683vsd; Sun, 25 Sep 2016 12:44:02 -0700 (PDT) X-Received: by 10.28.25.71 with SMTP id 68mr10826414wmz.91.1474832642221; Sun, 25 Sep 2016 12:44:02 -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 j8si2177142wjo.8.2016.09.25.12.44.01; Sun, 25 Sep 2016 12:44:02 -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 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 5D014689E12; Sun, 25 Sep 2016 22:43:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07462689AF0 for ; Sun, 25 Sep 2016 22:43:36 +0300 (EEST) Received: by mail-it0-f66.google.com with SMTP id n143so3870554ita.3 for ; Sun, 25 Sep 2016 12:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=SSENW8vpNd+YiypMJDX2bmNc7bsAE6k1Qq57dJa2Ht0=; b=QqGeE9LvIzhQy0ZM6asg+4ZZb31t0b6/iHP0i3SY9EnkxWG+QXcAwZMfJUW7YBbEbq uJ4dN6Fgz1rSPg4N9DqG4QWowf1CzOKuqx22XwZJGDGvjFx3rAZJCqlaKLJdCgKhsnQz PMmLYcY6iJb4Ru+qiGaM3H97ycrUnTi/nx5edh1WS43ijJaa3jG5pAzZ9XeokSY7x68P n+pYtnqGsDRw9ErAnXlSD7NR1y5VRJPXng8k2HJYM3/YkxII5DSagxRFditUOXITsHUA 8GZru6FLRKNa/q0osrEQEBp91Tzc1XnMZRaIMRF+85AVnM+WPHbDwFUdgB0u8STI7ics R/TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=SSENW8vpNd+YiypMJDX2bmNc7bsAE6k1Qq57dJa2Ht0=; b=bx2l5fa0REOJn2gPAhStfXMj9gpv9PIrciRz9/PtbjCmHhO0Cpdoao2wfu9d0+p7NH /EFhBuRQ0rVOVGEt/GqpOJnoanYrZQ6Npw04pdnMF0TfRfrvavmSbPigjP0X29VgmQiZ dRRePTAWj7wdSB0jV8gLHOJioxDjdE+xkg0CggPIjkQh0Hul4DOeHNkHJPmi2A//Qi/d Ivx6NUwxY8YCyK2+uqOLG/8Iu6e5kPoKH3cumaPYHg3UHatFc+XmBgcKa82F5qz2JUYg juxE9EGFR/Bp1MeI9KsAQKFhWulDIIWBd5cLv6lr6zwiZtIoLU84boMrcgasRBFNmQBi soRw== X-Gm-Message-State: AA6/9RmmXcoVmeG+a8EKRPXXtXiy0N1MkahqQ/7BPQaRx4fjEkM4+rn7yqcs43rynUni2g== X-Received: by 10.36.41.194 with SMTP id p185mr14033212itp.66.1474832631518; Sun, 25 Sep 2016 12:43:51 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id n92sm6896211ioi.25.2016.09.25.12.43.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 25 Sep 2016 12:43:51 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2016 14:43:47 -0500 Message-Id: <20160925194347.52223-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH] lavf/mpegtsenc: fix autobsf when the first NAL is 0x1 bytes 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mpegtsenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index fd849e5..ac27b81 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1790,11 +1790,15 @@ static int mpegts_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt if (st->codecpar->codec_id == AV_CODEC_ID_H264) { if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && - AV_RB24(pkt->data) != 0x000001) + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + st->codecpar->extradata[0] == 1))) ret = ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL); } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) { if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && - AV_RB24(pkt->data) != 0x000001) + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + st->codecpar->extradata[0] == 1))) ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); }