From patchwork Wed Nov 27 14:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 16458 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 C3F624481D0 for ; Wed, 27 Nov 2019 16:32:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A553F68B0AD; Wed, 27 Nov 2019 16:32:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44E4068AFE7 for ; Wed, 27 Nov 2019 16:32:46 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iZyI8-0001Fb-15 for ffmpeg-devel@ffmpeg.org; Wed, 27 Nov 2019 15:27:40 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZyH9iKmoLwlysZyH9iBhnv; Wed, 27 Nov 2019 15:26:40 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=HcGAGyVP5fv_CNmcSUYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 27 Nov 2019 15:24:55 +0100 Message-Id: <20191127142455.15369-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGKQ4XqXLAiPTQeV81XBcLw5RB341JMRAzBknrHYatAY4B2Ff2AIv+h7YeVsvN5lLBCas5l/H8ADhm2PTK6aorWtKkdkInpF5mTiLlHJ7Wrj4Dnt2BQf Q1BGVSKCRCDY6etMCma8ddabzjetvsBGO45H9X8fPhdUMDBG9qX7lyqD Subject: [FFmpeg-devel] [PATCH] avformat/utils: Simplify condition in av_read_frame() 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" Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 8196442dd1..dc79987ec1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1830,8 +1830,8 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) /* read packet from packet buffer, if there is data */ st = s->streams[next_pkt->stream_index]; - if (!(next_pkt->pts == AV_NOPTS_VALUE && st->discard < AVDISCARD_ALL && - next_pkt->dts != AV_NOPTS_VALUE && !eof)) { + if (next_pkt->pts != AV_NOPTS_VALUE || st->discard >= AVDISCARD_ALL || + next_pkt->dts == AV_NOPTS_VALUE || eof) { ret = ff_packet_list_get(&s->internal->packet_buffer, &s->internal->packet_buffer_end, pkt); goto return_packet;