Add ff_sauce_read()

[ffmpeg] / libavformat / assdec.c

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 82e6a712d778cde6cb1b1cc71d1de59bd9c7c7ac..676fb39d6c2684312899f9e6d94dc649875be067 100644 (file)
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -99,7 +99,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (!st)
         return -1;
     av_set_pts_info(st, 64, 1, 100);
-    st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+    st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
     st->codec->codec_id= CODEC_ID_SSA;
 
     header_remaining= INT_MAX;
@@ -143,7 +143,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
         p++;
     }
 
-    qsort(ass->event, ass->event_count, sizeof(*ass->event), event_cmp);
+    qsort(ass->event, ass->event_count, sizeof(*ass->event), (void*)event_cmp);
 
     return 0;
 
@@ -165,7 +165,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
     end= strchr(p, '\n');
     av_new_packet(pkt, end ? end-p+1 : strlen(p));
-    pkt->flags |= PKT_FLAG_KEY;
+    pkt->flags |= AV_PKT_FLAG_KEY;
     pkt->pos= p - ass->event_buffer + s->streams[0]->codec->extradata_size;
     pkt->pts= pkt->dts= get_pts(p);
     memcpy(pkt->data, p, pkt->size);
@@ -177,7 +177,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ass_demuxer = {
     "ass",
-    NULL_IF_CONFIG_SMALL("SSA/ASS format"),
+    NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
     sizeof(ASSContext),
     probe,
     read_header,