[FFmpeg-cvslog] lavc/mjpeg_parser: Allow jpegls parsing.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jul  5 23:48:22 2016 +0200| [420ba222c6150fda8c8d362932dbd29eb485bb17] | committer: Carl Eugen Hoyos

lavc/mjpeg_parser: Allow jpegls parsing.

Fixes ticket #5691.

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

 libavcodec/mjpeg_parser.c |    2 +-
 libavcodec/version.h      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mjpeg_parser.c b/libavcodec/mjpeg_parser.c
index e548b00..07a6b2b 100644
--- a/libavcodec/mjpeg_parser.c
+++ b/libavcodec/mjpeg_parser.c
@@ -127,7 +127,7 @@ static int jpeg_parse(AVCodecParserContext *s,
 
 
 AVCodecParser ff_mjpeg_parser = {
-    .codec_ids      = { AV_CODEC_ID_MJPEG },
+    .codec_ids      = { AV_CODEC_ID_MJPEG, AV_CODEC_ID_JPEGLS },
     .priv_data_size = sizeof(MJPEGParserContext),
     .parser_parse   = jpeg_parse,
     .parser_close   = ff_parse_close,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 4f6423b..5e04754 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR  57
 #define LIBAVCODEC_VERSION_MINOR  48
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MICRO 102
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \