diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 10:59:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 11:00:27 +0100 |
| commit | a696b0917d1d1ef5b0dee691786ddb51ee4ab519 (patch) | |
| tree | 38e280db66df3544f774f26f9a54d9d587dd9220 | |
| parent | 2b570c9569a2c8858f5f5f198efcf7000cfc4738 (diff) | |
| parent | fb5cf145b6bcfa4f83af94398e5560c1132cc410 (diff) | |
| download | ffmpeg-a696b0917d1d1ef5b0dee691786ddb51ee4ab519.tar.gz | |
Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'
* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410':
bmp: add a standalone parser
Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h
See: 011ce89dba5c0c764abc5f39acb6368f580742e3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/bmp_parser.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index 06ed367b38..eae8ae0a7f 100644 --- a/libavcodec/bmp_parser.c +++ b/libavcodec/bmp_parser.c @@ -25,6 +25,8 @@ */ #include "libavutil/bswap.h" +#include "libavutil/common.h" + #include "parser.h" typedef struct BMPParseContext { @@ -42,8 +44,6 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx, int next = END_NOT_FOUND; int i = 0; - s->pict_type = AV_PICTURE_TYPE_NONE; - *poutbuf_size = 0; if (buf_size == 0) return 0; diff --git a/libavcodec/version.h b/libavcodec/version.h index 968ff74b8f..6c09303ea6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 55 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |