Skip to content

F
ffmpeg
Commit 420ba222 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavc/mjpeg_parser: Allow jpegls parsing. 

Fixes ticket #5691.
parent 645489cf
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/mjpeg_parser.c
View file @ 420ba222
...@@ -127,7 +127,7 @@ static int jpeg_parse(AVCodecParserContext *s, ...@@ -127,7 +127,7 @@ static int jpeg_parse(AVCodecParserContext *s,
AVCodecParser ff_mjpeg_parser = { 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), .priv_data_size = sizeof(MJPEGParserContext),
.parser_parse = jpeg_parse, .parser_parse = jpeg_parse,
.parser_close = ff_parse_close, .parser_close = ff_parse_close,
......
libavcodec/version.h
View file @ 420ba222
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 48 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment