Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 19:52:37 +0000 (20:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 19:52:45 +0000 (20:52 +0100)
* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/parser.c

@@@ -238,13 -237,11 +238,13 @@@ int ff_combine_frame(ParseContext *pc, 
      /* copy into buffer end return */
      if (next == END_NOT_FOUND) {
          void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
-                                            (*buf_size) + pc->index +
+                                            *buf_size + pc->index +
                                             FF_INPUT_BUFFER_PADDING_SIZE);
  
 -        if (!new_buffer)
 +        if (!new_buffer) {
 +            pc->index = 0;
              return AVERROR(ENOMEM);
 +        }
          pc->buffer = new_buffer;
          memcpy(&pc->buffer[pc->index], *buf, *buf_size);
          pc->index += *buf_size;