[FFmpeg-cvslog] lavf/img2dec: Skip COM when auto-detecting jpeg.

Carl Eugen Hoyos git at videolan.org
Tue Mar 22 11:14:29 CET 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Mar 22 11:13:24 2016 +0100| [ef888de1c1d2581d45c1917d8f9081b35ea07a72] | committer: Carl Eugen Hoyos

lavf/img2dec: Skip COM when auto-detecting jpeg.

It could theoretically contain invalid data that gets ignored by decoders.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef888de1c1d2581d45c1917d8f9081b35ea07a72
---

 libavformat/img2dec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index fe0e346..6864374 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -742,6 +742,7 @@ static int jpeg_probe(AVProbeData *p)
         case APP13:
         case APP14:
         case APP15:
+        case COM:
             i += AV_RB16(&b[i + 2]) + 1;
             break;
         default:



More information about the ffmpeg-cvslog mailing list