Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b'

[ffmpeg] / libavformat / subtitles.h

diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h
index 885285cc4772b3e061d439236d42e0ea535b146a..c70f6fffde6a28999bd8d9f78ef9f29dfdff3a90 100644 (file)
--- a/libavformat/subtitles.h
+++ b/libavformat/subtitles.h
@@ -119,9 +119,10 @@ AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q,
                                     const uint8_t *event, size_t len, int merge);
 
 /**
- * Set missing durations and sort subtitles by PTS, and then byte position.
+ * Set missing durations, sort subtitles by PTS (and then byte position), and
+ * drop duplicated events.
  */
-void ff_subtitles_queue_finalize(FFDemuxSubtitlesQueue *q);
+void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q);
 
 /**
  * Generic read_packet() callback for subtitles demuxers using this queue