From patchwork Wed Feb 19 00:21:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 17843 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 D513B448ECF for ; Wed, 19 Feb 2020 02:22:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B413568AA24; Wed, 19 Feb 2020 02:22:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from so254-54.mailgun.net (so254-54.mailgun.net [198.61.254.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAD8D68A71F for ; Wed, 19 Feb 2020 02:21:59 +0200 (EET) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=rcombs.me; q=dns/txt; s=mx; t=1582071721; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=7/Teuf/9unElQNf7ir/pKZY+oW942TdQ4Wr4/QMQrVI=; b=louNAtFD98dvfyLqael8x62hC1uHrn1rGJLkvImjRhfW6wnJv1Iix5xqCcd77m+NF/KUQVdb DkAy2qKoVrVZE6aFu0auIl4R/DhoTrZTG2WrWeQDba6Ht2tlac1Pza01yUfbzvi3KmAprTBp eoFPCQelijsTrpnhQbJvrDZ1auo= X-Mailgun-Sending-Ip: 198.61.254.54 X-Mailgun-Sid: WyJiZDU1MSIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICJiMGJhIl0= Received: from MacBook-Pro.localdomain (Unknown [24.14.135.13]) by mxa.mailgun.org with ESMTP id 5e4c7fa1.7f54cf0189b0-smtp-out-n01; Wed, 19 Feb 2020 00:21:53 -0000 (UTC) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2020 18:21:48 -0600 Message-Id: <20200219002150.27705-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavf: add read_flush function to AVInputFormat vtable 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" --- libavformat/avformat.h | 6 ++++++ libavformat/utils.c | 4 ++++ libavformat/version.h | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 9b9b634ec3..1412119342 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -780,6 +780,12 @@ typedef struct AVInputFormat { * @see avdevice_capabilities_free() for more details. */ int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + + /** + * Flush demuxer-internal buffers ahead of a discontinuity in the input byte stream. + * @see avformat_flush() for more details. + */ + void (*read_flush)(struct AVFormatContext *s); } AVInputFormat; /** * @} diff --git a/libavformat/utils.c b/libavformat/utils.c index 123d67800b..c5fbe74c54 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2611,6 +2611,10 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int avformat_flush(AVFormatContext *s) { ff_read_frame_flush(s); + + if (s->iformat->read_flush) + s->iformat->read_flush(s); + return 0; } diff --git a/libavformat/version.h b/libavformat/version.h index 94fa57614d..741f2e30c5 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // 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 38 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 39 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \