avcodec/imgconvert: Remove deprecated parts of pixel format API

[ffmpeg] / libavformat / webvttdec.c

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 6c4d5f6736e12eb3da3ec5d89ed1bbd8dd58185e..8d2fdfed37dc83036d5318011a1579819f62fd88 100644 (file)
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -125,7 +125,7 @@ static int webvtt_read_header(AVFormatContext *s)
             break;
 
         /* optional cue settings */
-        p += strcspn(p, "\n\t ");
+        p += strcspn(p, "\n\r\t ");
         while (*p == '\t' || *p == ' ')
             p++;
         settings = p;
@@ -164,6 +164,8 @@ static int webvtt_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &webvtt->q);
 
 end:
+    if (res < 0)
+        ff_subtitles_queue_clean(&webvtt->q);
     av_bprint_finalize(&cue,    NULL);
     return res;
 }