diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:29:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:30:40 +0100 |
| commit | 2e974376570d41b3e7c16fa53b9af2023a81e39a (patch) | |
| tree | 9e6899ab936a027d296c24f1ab9e085e4cae1d30 /libavcodec | |
| parent | 9aabe6678147d947ce7a32bf9bb1e087fac7fdde (diff) | |
| parent | 87bd298abeb901fe16383a0d267502cc7fc03878 (diff) | |
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
DPX parser
Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h
See: 8ec328668a7d10c8224ae5f591add5b388ea82ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dpx_parser.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/dpx_parser.c b/libavcodec/dpx_parser.c index dd2a335c67..8e4a01e09d 100644 --- a/libavcodec/dpx_parser.c +++ b/libavcodec/dpx_parser.c @@ -25,6 +25,8 @@ */ #include "libavutil/bswap.h" +#include "libavutil/common.h" + #include "parser.h" typedef struct DPXParseContext { @@ -71,7 +73,7 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } - for (;d->pc.frame_start_found && i < buf_size; i++) { + for (; d->pc.frame_start_found && i < buf_size; i++) { d->pc.state = (d->pc.state << 8) | buf[i]; d->index++; if (d->index == 17) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 75e3da49fd..3124fb537b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 15 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 16 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |