From patchwork Mon Dec 5 07:33:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 1677 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1481754vsa; Sun, 4 Dec 2016 23:33:38 -0800 (PST) X-Received: by 10.28.23.16 with SMTP id 16mr8225337wmx.134.1480923218078; Sun, 04 Dec 2016 23:33:38 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o134si11752026wmd.69.2016.12.04.23.33.36; Sun, 04 Dec 2016 23:33:38 -0800 (PST) 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 1A1F6689FD3; Mon, 5 Dec 2016 09:33:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f48.google.com (mail-pg0-f48.google.com [74.125.83.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B837689D8B for ; Mon, 5 Dec 2016 09:33:18 +0200 (EET) Received: by mail-pg0-f48.google.com with SMTP id p66so133896002pga.2 for ; Sun, 04 Dec 2016 23:33:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:from:subject:message-id:date:user-agent:mime-version; bh=yagR2VFWPm1G9Z9mW4nRUB3aN8PfrghK8LcWoN8xmYQ=; b=K9EdeEE8f4ARu/Ty+OGN9gyqXBNBhi6qX7CUNRHswHbtRq3mbBRrrdYOF8T2j81C9j Co1LDg6eudxK6k+eIMjlpLv4BgvCz7HDlLbbKMpK68cCBf119iHVw3IKeVTZDOr9rjHf jOyGyyI9XTlwmqm14Ym5gcMiHJ3iw7wmFT5mMS0OC2m9dz1kXGwl2yRxOTka340IGzMS dXO1VhFOFRKLHOisVJ58idTncRbvvM28MJN2mT4f/0JbU9JuY1T4YtNI14Eeb9lc7sLs aU71SLJtRm4Uf0ISqbJr5a4aT9SmTDzsKgpWcK+j5DmVEspjGjJ7wiLvzid9O2ThYwse jSDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=yagR2VFWPm1G9Z9mW4nRUB3aN8PfrghK8LcWoN8xmYQ=; b=lVBqQ+WAb5Eth4kmJP2kC0KUJkPyROBYnrcDevT6GDq2jw8+3hUE+3END4SLU6GjSb TY8p8l0HZSzozTwQagqY3IzY/blUl/zjWqc/j/rPHEspR0bUak5XVIbx5Bd2UtToOeM0 lWMa0H/+WbF/Ts6FxfzyJb6PgCePEQNc6Ry2NYo8XkbOGfPxUZJha2xUQZ/aeKjmZION ok4thiAhPZjlgkUKpp3FTBKownAxzWmUGYo3V3wzUTMLj7SEsJyNjAY/sFF2PpiIsJds eQ3Shtt7PC5xkOD5N/HntlCqdsMwbz4dqM1CfkVKu3Z9rz+xzkJ6Q+YL1NT9orTHfyQz zWHA== X-Gm-Message-State: AKaTC00oLgMR128sNeRJXKV1a6/BAWuCFPnn1gE9g7LunMplgCp6VLBOQ6uiIt3uGZjSsA== X-Received: by 10.99.60.69 with SMTP id i5mr99577231pgn.158.1480923205993; Sun, 04 Dec 2016 23:33:25 -0800 (PST) Received: from [10.239.204.221] ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id g27sm24728062pfk.58.2016.12.04.23.33.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Dec 2016 23:33:25 -0800 (PST) To: FFmpeg development discussions and patches , jun.zhao@intel.com From: Jun Zhao Message-ID: <653c674d-47c2-1f98-8a47-98e2744fc5f2@gmail.com> Date: Mon, 5 Dec 2016 15:33:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 Content-Disposition: attachment; filename*0="0001-lavf-fix-the-wrong-warning-msg-and-comments-about-av.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavf: fix the wrong warning msg and comments about av_find_stream_info 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 1c4b61ef42baae788e950c36f292ddd2e7cd9943 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 5 Dec 2016 15:17:13 +0800 Subject: [PATCH] lavf: fix the wrong warning msg and comments about av_find_stream_info av_find_stream_info() was deprecated by avformat_find_stream_info(), correct the warning message in the avformat_find_stream_info() and comments in the avformat.h Signed-off-by: Jun Zhao --- libavformat/avformat.h | 4 ++-- libavformat/utils.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7c69614..adf08d7c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1007,7 +1007,7 @@ typedef struct AVStream { */ /** - * Stream information used internally by av_find_stream_info() + * Stream information used internally by avformat_find_stream_info() */ #define MAX_STD_TIMEBASES (30*12+30+3+6) struct { @@ -1059,7 +1059,7 @@ typedef struct AVStream { int probe_packets; /** - * Number of frames that have been demuxed during av_find_stream_info() + * Number of frames that have been demuxed during avformat_find_stream_info() */ int codec_info_nb_frames; diff --git a/libavformat/utils.c b/libavformat/utils.c index 482ff15..5f69b6b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3449,7 +3449,7 @@ FF_ENABLE_DEPRECATION_WARNINGS && codec && !avctx->codec) { if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) av_log(ic, AV_LOG_WARNING, - "Failed to open codec in av_find_stream_info\n"); + "Failed to open codec in %s\n",__FUNCTION__); } // Try to just open decoders, in case this is enough to get parameters. @@ -3457,7 +3457,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (codec && !avctx->codec) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) av_log(ic, AV_LOG_WARNING, - "Failed to open codec in av_find_stream_info\n"); + "Failed to open codec in %s\n",__FUNCTION__); } if (!options) av_dict_free(&thread_opt); @@ -3703,7 +3703,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0); if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0) av_log(ic, AV_LOG_WARNING, - "Failed to open codec in av_find_stream_info\n"); + "Failed to open codec in %s\n",__FUNCTION__); av_dict_free(&opts); } }