From patchwork Mon Nov 12 14:18:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 10999 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 6C2B944DEA0 for ; Mon, 12 Nov 2018 16:19:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D035E68A285; Mon, 12 Nov 2018 16:19:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE47768A27F for ; Mon, 12 Nov 2018 16:18:56 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id p4so373404wrt.7 for ; Mon, 12 Nov 2018 06:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mXZczPpXpv9UIFCgQbg7Q127eiDDkFhM6IAQkX8DpnU=; b=qjBANsfCr5iFz5iH1WpeCtdENkxZWlABZyv78EHATQpa/gIc/xTTby2pUIiSFLcl8J XwOyuhLEMmFLsqFzyEDgllsiaBbTFbMndjec/jaRhnvnW6Gg+SU09VlE7LgVdrS8qK8B VCkqE1iXceaRpdAPBlP3moZFeyrq9V2TVdizdIGBIs6rgixxxSrEUoxsnFCMbJILwHfC Hj+Gj33jAnQDxypk1+lkQnOK6Drl5+isrPuB+/0OEQuhqPbIxng7Bqw7jWOEv+Vs9ilg 3iePA38TWVXX8QWNe3Ihd0AxQl9MCYitKCZpoecIzXJOUcrCeF8I06Ha6DInzKHiZ0TJ EWbw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mXZczPpXpv9UIFCgQbg7Q127eiDDkFhM6IAQkX8DpnU=; b=rNrc9zrWrbF9rT1hxc2HfK9LWmYrS3fqA97BlkvynwFhGhzGMtuDVIwrFOnxjgyOYd XJCtoXaDmOfMsQGQczYhRA2bvpDNwfiQ1Pzsb+26t0O2tMp/Yng3ZbShV1muZfwJDebu u+msXBJ89Td6DlF4PlkxtGrkL2Mwnv8xC3Aitg4BPuBu0Ch8ORmzJkWoDeBHOSu0wVP1 KR2bOiAanimpH756btyY/OYvfqSVCSJSEYaL+WXPkkW46Qr8ymPorLXfB+69rOtX9trG NWzNIXEbFKVpEd0+n5u1frcaEyQuVLfGRypk0W77PYRDRpB0yiIWcaCssAog42WHMGpE RByA== X-Gm-Message-State: AGRZ1gIMpwJKnVoSWkXRNF55LHWpQs+FYUQ8M5YQGocnrTv8xeVefulO MySJ5L96Hjz4Neyy8vtiSqFko18a X-Google-Smtp-Source: AJdET5dL7+GZ/XOXrpLyEMHm8J/btoLcJT9kdftNwmlVKHnuoee6bd5KuVTUvL1lC4Dya1FJ8bSnZA== X-Received: by 2002:a5d:4609:: with SMTP id t9-v6mr1255266wrq.198.1542032372953; Mon, 12 Nov 2018 06:19:32 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id 11-v6sm16981626wmk.26.2018.11.12.06.19.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 06:19:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Nov 2018 15:18:12 +0100 Message-Id: <20181112141815.4472-2-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181112141815.4472-1-andreas.rheinhardt@googlemail.com> References: <20181112141815.4472-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] h264_levels, h264_metadata_bsf: Fix levels typo 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_levels.c | 2 +- libavcodec/h264_metadata_bsf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index 737b7dcf06..7a55116773 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -25,7 +25,7 @@ static const H264LevelDescriptor h264_levels[] = { // | level_idc | MaxFS | MaxCPB | MaxMvsPer2Mb // | | cs3f | | MaxDpbMbs | | MaxVmvR | | { "1", 10, 0, 1485, 99, 396, 64, 175, 64, 2, 0 }, - { "1b", 10, 1, 1485, 99, 396, 128, 350, 64, 2, 0 }, + { "1b", 11, 1, 1485, 99, 396, 128, 350, 64, 2, 0 }, { "1b", 9, 0, 1485, 99, 396, 128, 350, 64, 2, 0 }, { "1.1", 11, 0, 3000, 396, 900, 192, 500, 128, 2, 0 }, { "1.2", 12, 0, 6000, 396, 2376, 384, 1000, 128, 2, 0 }, diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index bf37528234..521bc36b7e 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -258,7 +258,7 @@ static int h264_metadata_update_sps(AVBSFContext *bsf, if (sps->profile_idc == 66 || sps->profile_idc == 77 || sps->profile_idc == 88) { - sps->level_idc = 10; + sps->level_idc = 11; sps->constraint_set3_flag = 1; } else { sps->level_idc = 9;