Re: [FFmpeg-devel] [PATCH 2/3] avformat/webvttdec: Don't stop parsing on comments

2015-10-12 Thread Clément Bœsch 
On Sun, Oct 11, 2015 at 05:11:02PM +0100, Ricardo Constantino wrote:
> Signed-off-by: Ricardo Constantino 
> ---
>  libavformat/webvttdec.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
> index 43c2a63..47a3255 100644
> --- a/libavformat/webvttdec.c
> +++ b/libavformat/webvttdec.c
> @@ -92,7 +92,8 @@ static int webvtt_read_header(AVFormatContext *s)
>  
>  /* ignore header chunk */
>  if (!strncmp(p, "\xEF\xBB\xBFWEBVTT", 9) ||
> -!strncmp(p, "WEBVTT", 6))
> +!strncmp(p, "WEBVTT", 6) ||
> +!strncmp(p, "NOTE", 4))
>  continue;
>  

Applied, thanks

-- 
Clément B.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/3] avformat/webvttdec: Don't stop parsing on comments

2015-10-11 Thread Ricardo Constantino 
Signed-off-by: Ricardo Constantino 
---
 libavformat/webvttdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 43c2a63..47a3255 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -92,7 +92,8 @@ static int webvtt_read_header(AVFormatContext *s)
 
 /* ignore header chunk */
 if (!strncmp(p, "\xEF\xBB\xBFWEBVTT", 9) ||
-!strncmp(p, "WEBVTT", 6))
+!strncmp(p, "WEBVTT", 6) ||
+!strncmp(p, "NOTE", 4))
 continue;
 
 /* optional cue identifier (can be a number like in SRT or some kind of
-- 
2.6.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 2/3] avformat/webvttdec: Don't stop parsing on comments

2015-10-09 Thread Ricardo Constantino 
Signed-off-by: Ricardo Constantino 
---
 libavformat/webvttdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 43c2a63..47a3255 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -92,7 +92,8 @@ static int webvtt_read_header(AVFormatContext *s)
 
 /* ignore header chunk */
 if (!strncmp(p, "\xEF\xBB\xBFWEBVTT", 9) ||
-!strncmp(p, "WEBVTT", 6))
+!strncmp(p, "WEBVTT", 6) ||
+!strncmp(p, "NOTE", 4))
 continue;
 
 /* optional cue identifier (can be a number like in SRT or some kind of
-- 
2.6.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel