Commit 069c8975 authored by Clément Bœsch's avatar Clément Bœsch

lavf/assdec: add ass_ prefix to callbacks.

parent e0260e25
...@@ -28,7 +28,7 @@ typedef struct ASSContext{ ...@@ -28,7 +28,7 @@ typedef struct ASSContext{
FFDemuxSubtitlesQueue q; FFDemuxSubtitlesQueue q;
}ASSContext; }ASSContext;
static int probe(AVProbeData *p) static int ass_probe(AVProbeData *p)
{ {
const char *header= "[Script Info]"; const char *header= "[Script Info]";
...@@ -39,7 +39,7 @@ static int probe(AVProbeData *p) ...@@ -39,7 +39,7 @@ static int probe(AVProbeData *p)
return 0; return 0;
} }
static int read_close(AVFormatContext *s) static int ass_read_close(AVFormatContext *s)
{ {
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;
ff_subtitles_queue_clean(&ass->q); ff_subtitles_queue_clean(&ass->q);
...@@ -79,7 +79,7 @@ static int64_t get_line(AVBPrint *buf, AVIOContext *pb) ...@@ -79,7 +79,7 @@ static int64_t get_line(AVBPrint *buf, AVIOContext *pb)
return pos; return pos;
} }
static int read_header(AVFormatContext *s) static int ass_read_header(AVFormatContext *s)
{ {
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;
AVBPrint header, line; AVBPrint header, line;
...@@ -145,13 +145,13 @@ end: ...@@ -145,13 +145,13 @@ end:
return res; return res;
} }
static int read_packet(AVFormatContext *s, AVPacket *pkt) static int ass_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;
return ff_subtitles_queue_read_packet(&ass->q, pkt); return ff_subtitles_queue_read_packet(&ass->q, pkt);
} }
static int read_seek2(AVFormatContext *s, int stream_index, static int ass_read_seek(AVFormatContext *s, int stream_index,
int64_t min_ts, int64_t ts, int64_t max_ts, int flags) int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
{ {
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;
...@@ -163,9 +163,9 @@ AVInputFormat ff_ass_demuxer = { ...@@ -163,9 +163,9 @@ AVInputFormat ff_ass_demuxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.priv_data_size = sizeof(ASSContext), .priv_data_size = sizeof(ASSContext),
.read_probe = probe, .read_probe = ass_probe,
.read_header = read_header, .read_header = ass_read_header,
.read_packet = read_packet, .read_packet = ass_read_packet,
.read_close = read_close, .read_close = ass_read_close,
.read_seek2 = read_seek2, .read_seek2 = ass_read_seek,
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment