From patchwork Thu Sep 22 12:00:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 678 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1380036vsd; Thu, 22 Sep 2016 05:00:22 -0700 (PDT) X-Received: by 10.28.164.130 with SMTP id n124mr7426082wme.105.1474545622593; Thu, 22 Sep 2016 05:00:22 -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 b83si37732991wmi.3.2016.09.22.05.00.21; Thu, 22 Sep 2016 05:00:22 -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=@rothenpieler.org; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B4FF689CE0; Thu, 22 Sep 2016 15:00:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D657689CB2 for ; Thu, 22 Sep 2016 14:59:56 +0300 (EEST) Received: from localhost.localdomain (ip4d1666ad.dynamic.kabel-deutschland.de [77.22.102.173]) by btbn.de (Postfix) with ESMTPSA id 20EDC32766F; Thu, 22 Sep 2016 14:00:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1474545612; bh=g6EsM3W1gKvqSAAzvl7SlhfoJAWhBdmn3Sb81Zb/MSo=; h=From:To:Cc:Subject:Date; b=BsX6AZgSClJy/G5OjrSIrqrU+mlrVK3T9THbxBd4QX+phhyp+Zbju4gqWK1aavE69 ZToaatr4RVHAjAIwJTPV3V2/obw5losZnchBA1p/C5X7jtpCxdfaJD1HDhTYzMO4Rh 1MZlSNHBD8OF+EmcuosFUHD7tM/FC/c1hgcqPYoM= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Sep 2016 14:00:03 +0200 Message-Id: <20160922120005.1083-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec: add new AVOID_PROBING capability 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 10 ++++++++++ libavcodec/version.h | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 158a0b2..5d577e4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-09-xx - xxxxxxx - lavc 57.58.100 - avcodec.h + Add AV_CODEC_CAP_AVOID_PROBING codec capability flag. + 2016-09-xx - xxxxxxx - lavf 57.49.100 - avformat.h Add avformat_transfer_internal_stream_timing_info helper to help with stream copy. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index db1061d..b174116 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1036,6 +1036,16 @@ typedef struct RcOverride{ */ #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16) /** + * Decoder is not a preferred choice for probing. + * This indicates that the decoder is not a good choice for probing. + * It could for example be an expensive to spin up hardware decoder, + * or it could simply not provide a lot of useful information about + * the stream. + * A decoder marked with this flag should only be used as last resort + * choice for probing. + */ +#define AV_CODEC_CAP_AVOID_PROBING (1 << 17) +/** * Codec is intra only. */ #define AV_CODEC_CAP_INTRA_ONLY 0x40000000 diff --git a/libavcodec/version.h b/libavcodec/version.h index 9acf081..9e44eca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 57 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 58 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \