avformat/subtitles: Deduplicate subtitles' read_(packet|seek|close)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 3 insertions, 24 deletions

diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c
index abf0e7fb9a..d290a41fb9 100644
--- a/libavformat/mpsubdec.c
+++ b/libavformat/mpsubdec.c
@@ -169,27 +169,6 @@ end:
     return res;
 }
 
-static int mpsub_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    MPSubContext *mpsub = s->priv_data;
-    return ff_subtitles_queue_read_packet(&mpsub->q, pkt);
-}
-
-static int mpsub_read_seek(AVFormatContext *s, int stream_index,
-                           int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
-{
-    MPSubContext *mpsub = s->priv_data;
-    return ff_subtitles_queue_seek(&mpsub->q, s, stream_index,
-                                   min_ts, ts, max_ts, flags);
-}
-
-static int mpsub_read_close(AVFormatContext *s)
-{
-    MPSubContext *mpsub = s->priv_data;
-    ff_subtitles_queue_clean(&mpsub->q);
-    return 0;
-}
-
 const AVInputFormat ff_mpsub_demuxer = {
     .name           = "mpsub",
     .long_name      = NULL_IF_CONFIG_SMALL("MPlayer subtitles"),
@@ -197,8 +176,8 @@ const AVInputFormat ff_mpsub_demuxer = {
     .flags_internal = FF_FMT_INIT_CLEANUP,
     .read_probe     = mpsub_probe,
     .read_header    = mpsub_read_header,
-    .read_packet    = mpsub_read_packet,
-    .read_seek2     = mpsub_read_seek,
-    .read_close     = mpsub_read_close,
     .extensions     = "sub",
+    .read_packet    = ff_subtitles_read_packet,
+    .read_seek2     = ff_subtitles_read_seek,
+    .read_close     = ff_subtitles_read_close,
 };