RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-25 20:52:37 +01:00
parent 1f2bacc897 4ec336484d
commit 2673357048
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/parser.c
View File

@ -177,8 +177,8 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
const uint8_t *buf, int buf_size, int keyframe) const uint8_t *buf, int buf_size, int keyframe)
{ {
if (s && s->parser->split) { if (s && s->parser->split) {
if ((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER ||
(avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) { avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER) {
int i = s->parser->split(avctx, buf, buf_size); int i = s->parser->split(avctx, buf, buf_size);
buf += i; buf += i;
buf_size -= i; buf_size -= i;
@ -189,14 +189,14 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
*poutbuf = (uint8_t *) buf; *poutbuf = (uint8_t *) buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
if (avctx->extradata) { if (avctx->extradata) {
if ((keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))) { if (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) {
int size = buf_size + avctx->extradata_size; int size = buf_size + avctx->extradata_size;
*poutbuf_size = size; *poutbuf_size = size;
*poutbuf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); *poutbuf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy(*poutbuf, avctx->extradata, avctx->extradata_size); memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
memcpy((*poutbuf) + avctx->extradata_size, buf, memcpy(*poutbuf + avctx->extradata_size, buf,
buf_size + FF_INPUT_BUFFER_PADDING_SIZE); buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
return 1; return 1;
} }
@ -238,7 +238,7 @@ int ff_combine_frame(ParseContext *pc, int next,
/* copy into buffer end return */ /* copy into buffer end return */
if (next == END_NOT_FOUND) { if (next == END_NOT_FOUND) {
void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
(*buf_size) + pc->index + *buf_size + pc->index +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
if (!new_buffer) { if (!new_buffer) {
@ -274,8 +274,8 @@ int ff_combine_frame(ParseContext *pc, int next,
/* store overread bytes */ /* store overread bytes */
for (; next < 0; next++) { for (; next < 0; next++) {
pc->state = (pc->state << 8) | pc->buffer[pc->last_index + next]; pc->state = pc->state << 8 | pc->buffer[pc->last_index + next];
pc->state64 = (pc->state64 << 8) | pc->buffer[pc->last_index + next]; pc->state64 = pc->state64 << 8 | pc->buffer[pc->last_index + next];
pc->overread++; pc->overread++;
} }
@ -302,7 +302,7 @@ int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
uint32_t state = -1; uint32_t state = -1;
for (i = 0; i < buf_size; i++) { for (i = 0; i < buf_size; i++) {
state = (state << 8) | buf[i]; state = state << 8 | buf[i];
if (state == 0x1B3 || state == 0x1B6) if (state == 0x1B3 || state == 0x1B6)
return i - 3; return i - 3;
} }