Browse Source

lavc/mjpeg_parser: Allow jpegls parsing.

Fixes ticket #5691.
tags/n3.2
Carl Eugen Hoyos 9 years ago
parent
commit
420ba222c6
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavcodec/mjpeg_parser.c
  2. +1
    -1
      libavcodec/version.h

+ 1
- 1
libavcodec/mjpeg_parser.c View File

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


+ 1
- 1
libavcodec/version.h View File

@@ -29,7 +29,7 @@

#define LIBAVCODEC_VERSION_MAJOR 57
#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, \
LIBAVCODEC_VERSION_MINOR, \


Loading…
Cancel
Save