[FFmpeg-devel] [PATCH]lavf/img2dec: Skip SOS when auto-detecting jpeg

2016-02-28 Thread Carl Eugen Hoyos 
Hi!

I believe attached patch fixes a possible issue when auto-detecting jpeg.

Please review, Carl Eugen
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 28a1fdb..94cce93 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -715,6 +715,7 @@ static int jpeg_probe(AVProbeData *p)
 state = 0xC0;
 break;
 case 0xDA:
+i += AV_RB16(&b[i + 2]) + 1;
 if (state != 0xC0 && state != 0xDA)
 return 0;
 state = 0xDA;
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH]lavf/img2dec: Skip SOS when auto-detecting jpeg

2016-02-29 Thread Michael Niedermayer 
On Mon, Feb 29, 2016 at 01:45:28AM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> I believe attached patch fixes a possible issue when auto-detecting jpeg.
> 
> Please review, Carl Eugen

>  img2dec.c |1 +
>  1 file changed, 1 insertion(+)
> db2e658f6b6761e038746e51569a9faf5516e0ff  patchsoslength.diff
> diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c

LGTM

thx

[...]


-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator


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

Re: [FFmpeg-devel] [PATCH]lavf/img2dec: Skip SOS when auto-detecting jpeg

2016-02-29 Thread Carl Eugen Hoyos 
Michael Niedermayer  niedermayer.cc> writes:

> >  img2dec.c |1 +
> >  1 file changed, 1 insertion(+)
> > db2e658f6b6761e038746e51569a9faf5516e0ff  patchsoslength.diff
> > diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
> 
> LGTM

Patch applied.

Thank you, Carl Eugen

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