Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"

[ffmpeg] / libavcodec / mjpeg_parser.c

diff --git a/libavcodec/mjpeg_parser.c b/libavcodec/mjpeg_parser.c
index e548b00f407002d8516f684ed691f6ccb43c2888..07a6b2bdc653235e5c5517076705276dab36f50f 100644 (file)
--- 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,