From 420ba222c6150fda8c8d362932dbd29eb485bb17 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Tue, 5 Jul 2016 23:48:22 +0200
Subject: lavc/mjpeg_parser: Allow jpegls parsing.

Fixes ticket #5691.
---
 libavcodec/mjpeg_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec/mjpeg_parser.c')

diff --git a/libavcodec/mjpeg_parser.c b/libavcodec/mjpeg_parser.c
index e548b00f40..07a6b2bdc6 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,
-- 
cgit v1.2.1