configure: add -lvulkan to libglslang's lib flags

[ffmpeg] / libavformat / subtitles.h

diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h
index ca78db224d52f26fa4e8d7dffce68b05df579594..ca769639bebc97284c6d4f1daf90a28bf3b77041 100644 (file)
--- a/libavformat/subtitles.h
+++ b/libavformat/subtitles.h
@@ -100,7 +100,7 @@ int ff_text_peek_r8(FFTextReader *r);
 void ff_text_read(FFTextReader *r, char *buf, size_t size);
 
 typedef struct {
-    AVPacket *subs;         ///< array of subtitles packets
+    AVPacket **subs;         ///< array of subtitles packets
     int nb_subs;            ///< number of subtitles packets
     int allocated_size;     ///< allocated size for subs
     int current_sub_idx;    ///< current position for the read packet callback
@@ -188,7 +188,7 @@ static av_always_inline int ff_subtitles_next_line(const char *ptr)
 {
     int n = strcspn(ptr, "\r\n");
     ptr += n;
-    if (*ptr == '\r') {
+    while (*ptr == '\r') {
         ptr++;
         n++;
     }