From patchwork Fri Jun 28 07:21:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13740 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 EDF3E4477C4 for ; Fri, 28 Jun 2019 10:27:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9F3F68AAEA; Fri, 28 Jun 2019 10:27:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1EC868A539 for ; Fri, 28 Jun 2019 10:26:59 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id b7so2745994pls.6 for ; Fri, 28 Jun 2019 00:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zfk8uQV3zKV1BmQtPrHOdgXZxXomQNUgQzbgVJwMXO8=; b=HJgbJbJAVkYvzQYwjlNSNka6/LHM2rXCtByKZC+LCh9ZkLCjdYjkDJvQnvwEz+FzzC Ml7LzRvLNXszlzmY43ghe2r8cW5xWbGDjMNkHuJPl3M/Tb1MKsfHz4L0q0ScW72IJkpI tR4wcW5X3ZuqZKaqnk8jLgPxIvIKohtK6JSW/yTi9OtMPd0gQs8HSi2JoD6imcUu5mHb V74aYI1wirbRow428xjS0Z4C1BzTmfWCbx90UqILEe7B+mmJ7oQn7Oq/f9m/QPEFn+ZC 2oBos6qeGXZ1864NsZnQcPBZjfUiWQjNNLwa9JMBFuIOcGbYI1+KZ/Hb0UlEEZd/ORzj zFSg== 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; bh=zfk8uQV3zKV1BmQtPrHOdgXZxXomQNUgQzbgVJwMXO8=; b=XKnZlFGDMQI7B53rEq8aGsG5GBk3nBrZTYkFcRySrump6X8aavC/WSIBhLK1LxiQE8 XM46BtjOT2XHPLBAnY7vthPfTRfKjaDncFDurkZVs8bXh51v5sGqNuAc+2Y8IUlqmgMV mDFjPXqnRQj3971ZJqCdY5GyrSbR3Yqg1rcSd0/HsVAuZFM8LE+0oc24ioeQN5c4g4uF gEJSTC/n579NfLJpjMUfxz6NEuap4HGCn6ykTkf2O9xPKMRTijxw1aBQQ4nQSem0MmXY +1TMhpfObioDY96Pcq+6mMVeDW0S4ObwLFpNVK92zdHoVawtcmg1nyvc8RM/x6pdi6r+ 0NVQ== X-Gm-Message-State: APjAAAUvoTLxfa+3ArbnqbvBlSNw8fSFdJdqo2hUEa1KkKnoI9ejLVIO Z1DM6Ux4jfDxlb3176E3KljcdSd2 X-Google-Smtp-Source: APXvYqzGwBSiuEXeSnIzAZAdGnx7A1qjZ2FyFM1dD4RimtNq+A8RJb97I38fOUk9xUY7JcQnm03ACg== X-Received: by 2002:a17:902:7583:: with SMTP id j3mr577734pll.196.1561706481284; Fri, 28 Jun 2019 00:21:21 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m5sm1206791pjl.24.2019.06.28.00.21.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jun 2019 00:21:20 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2019 15:21:09 +0800 Message-Id: <1561706472-15018-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1561706472-15018-1-git-send-email-mypopydev@gmail.com> References: <1561706472-15018-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 1/4] lavf/utils: Respect default disposition when select the AVStream 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Respect default disposition when select the AVStream Signed-off-by: Jun Zhao --- libavformat/utils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3d764c1..886cd6f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4218,7 +4218,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, continue; } } - disposition = !(st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | AV_DISPOSITION_VISUAL_IMPAIRED)); + disposition = !(st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | AV_DISPOSITION_VISUAL_IMPAIRED)) + + !! (st->disposition & AV_DISPOSITION_DEFAULT); count = st->codec_info_nb_frames; bitrate = par->bit_rate; multiframe = FFMIN(5, count);