highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/mjpeg_parser: Allow jpegls parsing.

Browse Source 
Fixes ticket #5691.
This commit is contained in:
Carl Eugen Hoyos 2016-07-05 23:48:22 +02:00
parent 645489cf90
commit 420ba222c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mjpeg_parser.c
View File

@ -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,

2
libavcodec/version.h
View File

@ -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, \