Commit 2e974376 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '87bd298a'

* commit '87bd298a':
  DPX parser

Conflicts:
	libavcodec/dpx_parser.c
	libavcodec/version.h

See: 8ec32866Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9aabe667 87bd298a
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
*/ */
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h"
#include "parser.h" #include "parser.h"
typedef struct DPXParseContext { typedef struct DPXParseContext {
...@@ -71,7 +73,7 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx, ...@@ -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->pc.state = (d->pc.state << 8) | buf[i];
d->index++; d->index++;
if (d->index == 17) { if (d->index == 17) {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 15 #define LIBAVCODEC_VERSION_MINOR 16
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 100
#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