diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-07-05 23:48:22 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-07-05 23:48:22 +0200 |
| commit | 420ba222c6150fda8c8d362932dbd29eb485bb17 (patch) | |
| tree | bb66a06f7349f4f4f63b0ecc9544f2a62b315318 /libavcodec/mjpeg_parser.c | |
| parent | 645489cf90b09a3bd1ed57b2c13b37b1512450bb (diff) | |
| download | ffmpeg-420ba222c6150fda8c8d362932dbd29eb485bb17.tar.gz | |
lavc/mjpeg_parser: Allow jpegls parsing.
Fixes ticket #5691.
Diffstat (limited to 'libavcodec/mjpeg_parser.c')
| -rw-r--r-- | libavcodec/mjpeg_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |