frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavformat / assdec.c

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index c5d319dffc67e9d0bc8f305b41424fbc05039d9b..32fb09d22d001cb02101cc3963844667e06d5040 100644 (file)
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -37,7 +37,7 @@ static void get_line(ByteIOContext *s, char *buf, int maxlen)
 
     do{
         c = get_byte(s);
-        if (i < maxlen-1 && c != '\r')
+        if (i < maxlen-1)
             buf[i++] = c;
     }while(c != '\n' && c);
 
@@ -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;