Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 18:29:43 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 18:29:43 +0000 (20:29 +0200)
* qatar/master:
  mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
  x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/h264_intrapred.asm
libavformat/mxfdec.c

Simple merge
@@@ -730,12 -696,29 +730,13 @@@ static int mxf_read_index_entry_array(A
      int i, length;
  
      segment->nb_index_entries = avio_rb32(pb);
 -    if (!segment->nb_index_entries)
 -        return 0;
 -    else if (segment->nb_index_entries < 0 ||
 -             segment->nb_index_entries >
 -             (INT_MAX / sizeof(*segment->stream_offset_entries)))
 -        return AVERROR(ENOMEM);
      length = avio_rb32(pb);
  
 -    segment->temporal_offset_entries = av_mallocz(segment->nb_index_entries *
 -                                 sizeof(*segment->temporal_offset_entries));
 -    segment->flag_entries            = av_mallocz(segment->nb_index_entries *
 -                                 sizeof(*segment->flag_entries));
 -    segment->stream_offset_entries   = av_mallocz(segment->nb_index_entries *
 -                                 sizeof(*segment->stream_offset_entries));
 -
 -    if (!segment->flag_entries || !segment->stream_offset_entries ||
 -        !segment->temporal_offset_entries) {
 -        av_freep(&segment->flag_entries);
 -        av_freep(&segment->stream_offset_entries);
 -        av_freep(&segment->temporal_offset_entries);
 +    if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||
 +        !(segment->flag_entries          = av_calloc(segment->nb_index_entries, sizeof(*segment->flag_entries))) ||
 +        !(segment->stream_offset_entries = av_calloc(segment->nb_index_entries, sizeof(*segment->stream_offset_entries))))
          return AVERROR(ENOMEM);
 -    }
  
      for (i = 0; i < segment->nb_index_entries; i++) {
          segment->temporal_offset_entries[i] = avio_r8(pb);