← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavcodec/parser.c

  • Committer: Reinhard Tartler
  • Date: 2013-03-27 06:53:14 UTC
  • mfrom: (1.3.32 sid)
  • Revision ID: siretart@tauware.de-20130327065314-fs4shpt6y2h46ekf
first merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/parser.c
261
261
        if(!new_buffer)
262
262
            return AVERROR(ENOMEM);
263
263
        pc->buffer = new_buffer;
264
 
        memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
 
264
        if (next > -FF_INPUT_BUFFER_PADDING_SIZE)
 
265
            memcpy(&pc->buffer[pc->index], *buf,
 
266
                   next + FF_INPUT_BUFFER_PADDING_SIZE);
265
267
        pc->index = 0;
266
268
        *buf= pc->buffer;
267
269
    }