mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
DPX parser
Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h
See: 8ec328668a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2e97437657
@ -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) {
|
||||
|
@ -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, \
|
||||
|
Loading…
Reference in New Issue
Block a user