From patchwork Wed Nov 27 01:18:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 16423 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 86AF4448CEA for ; Wed, 27 Nov 2019 03:47:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6136B68AF74; Wed, 27 Nov 2019 03:47:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD54968AF6F for ; Wed, 27 Nov 2019 03:47:29 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id 6so5421751pgk.0 for ; Tue, 26 Nov 2019 17:47:29 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=/0m+IuFQjD9rZ6GxlmCLlJPwlpM/FJPAU6Kl1OfOo8w=; b=DOHf1vocgE6iluWytIlPwHUoWYhAKXI+rwbD7H1XEJzSwWav8tRDzziXOy1xwC6VLL qZMVq09MFFgoTX9Oek18k5ZhVcdnHr/YksbKVZzHOlP03cfaljSRr3I+ZAel7ovlURwj gUQ7OkA1PV91e/dBsR9nVUUgm4VWbhZgfTvrsAXPWx3VBaLV5CYYhNMAW/0CrqcWhQxI xHATb3YExxzKDPkZfEGt44L7q+jsDZ/5qrRJzz9JIXFYvsSUllkC2i3+iaQB4gkT2uel kV9Dl4xX4vcnMege7ZiyMswiENeLlXZ0imFhSkdGIFQUwziBQOwNHu3oIHuOvyd+n+pW uIgQ== X-Gm-Message-State: APjAAAWpNh+L8wwKcUY92AkoKpjLh8XXPmGjr/ZdAIEAiirQ2KAWx+en 2k5C+/GIqIykxCnsKooOEAxw9GwWzzdAUQ== X-Google-Smtp-Source: APXvYqzIBsJMxdKBgzklft02T1MaW5y7i6Cg4tFMj71DXbRBYffjbvGWOoVGAp+FK/8e2OQq8hKJWw== X-Received: by 2002:a62:6481:: with SMTP id y123mr43019022pfb.181.1574817538139; Tue, 26 Nov 2019 17:18:58 -0800 (PST) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id d188sm13546296pfa.157.2019.11.26.17.18.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Nov 2019 17:18:57 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Nov 2019 17:18:52 -0800 Message-Id: <20191127011852.43933-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: expose avlanguage.h 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: Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- doc/APIchanges | 3 +++ libavformat/Makefile | 1 + libavformat/avlanguage.c | 2 -- libavformat/avlanguage.h | 5 +---- libavformat/version.h | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 401c65a753..0cf9a6e2a3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-11-26 - xxxxxxxxxx - lavf 58.36.100 - avlanguage.h + Add av_convert_lang_to(). + 2019-11-17 - 1c23abc88f - lavu 56.36.100 - eval API Add av_expr_count_vars(). diff --git a/libavformat/Makefile b/libavformat/Makefile index 52f29b1a6d..7460f73fa2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -3,6 +3,7 @@ DESC = FFmpeg container format library HEADERS = avformat.h \ avio.h \ + avlanguage.h \ version.h \ OBJS = allformats.o \ diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index f5d2ddf304..1673dc4726 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -764,9 +764,7 @@ const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_cod return NULL; } -#if LIBAVFORMAT_VERSION_MAJOR < 58 const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) { return ff_convert_lang_to(lang, target_codespace); } -#endif diff --git a/libavformat/avlanguage.h b/libavformat/avlanguage.h index 1d72dcb3cb..00f2b15f03 100644 --- a/libavformat/avlanguage.h +++ b/libavformat/avlanguage.h @@ -37,10 +37,7 @@ enum AVLangCodespace { * Convert a language code to a target codespace. The source codespace is guessed. * @return NULL if the provided lang is null or invalid. */ -const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); -#if LIBAVFORMAT_VERSION_MAJOR < 58 -attribute_deprecated const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); -#endif +const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); #endif /* AVFORMAT_AVLANGUAGE_H */ diff --git a/libavformat/version.h b/libavformat/version.h index bac54aed9d..f72fb9478a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 35 +#define LIBAVFORMAT_VERSION_MINOR 36 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \