From ea5bdc8893e4c1d5c3b417afad78ccedaa831789 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 8 Jul 2021 23:05:08 +0200 Subject: avformat/subtitles: Deduplicate subtitles' read_(packet|seek|close) Signed-off-by: Andreas Rheinhardt --- libavformat/subviewerdec.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'libavformat/subviewerdec.c') diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c index 2ef3c088eb..bcd103bd86 100644 --- a/libavformat/subviewerdec.c +++ b/libavformat/subviewerdec.c @@ -180,27 +180,6 @@ end: return res; } -static int subviewer_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - SubViewerContext *subviewer = s->priv_data; - return ff_subtitles_queue_read_packet(&subviewer->q, pkt); -} - -static int subviewer_read_seek(AVFormatContext *s, int stream_index, - int64_t min_ts, int64_t ts, int64_t max_ts, int flags) -{ - SubViewerContext *subviewer = s->priv_data; - return ff_subtitles_queue_seek(&subviewer->q, s, stream_index, - min_ts, ts, max_ts, flags); -} - -static int subviewer_read_close(AVFormatContext *s) -{ - SubViewerContext *subviewer = s->priv_data; - ff_subtitles_queue_clean(&subviewer->q); - return 0; -} - const AVInputFormat ff_subviewer_demuxer = { .name = "subviewer", .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle format"), @@ -208,8 +187,8 @@ const AVInputFormat ff_subviewer_demuxer = { .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = subviewer_probe, .read_header = subviewer_read_header, - .read_packet = subviewer_read_packet, - .read_seek2 = subviewer_read_seek, - .read_close = subviewer_read_close, .extensions = "sub", + .read_packet = ff_subtitles_read_packet, + .read_seek2 = ff_subtitles_read_seek, + .read_close = ff_subtitles_read_close, }; -- cgit v1.2.3