Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 May 2012 22:44:48 +0000 (00:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 May 2012 22:54:28 +0000 (00:54 +0200)
* qatar/master:
  configure: add POWER[5-7] support
  arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
  vqavideo: return error if image size is not a multiple of block size
  cosmetics: indentation
  avformat: only fill-in interpolated timestamps if duration is non-zero
  avformat: remove a workaround for broken timestamps

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/vqavideo.c
libavformat/utils.c
libavutil/arm/intreadwrite.h

diff --cc configure
Simple merge
@@@ -155,6 -151,12 +155,11 @@@ static av_cold int vqa_decode_init(AVCo
          return -1;
      }
  
 -    if (s->width  & (s->vector_width  - 1) ||
 -        s->height & (s->vector_height - 1)) {
++    if (s->width % s->vector_width || s->height % s->vector_height) {
+         av_log(avctx, AV_LOG_ERROR, "Image size not multiple of block size\n");
+         return AVERROR_INVALIDDATA;
+     }
      /* allocate codebooks */
      s->codebook_size = MAX_CODEBOOK_SIZE;
      s->codebook = av_malloc(s->codebook_size);
@@@ -1081,15 -985,19 +1081,16 @@@ static void compute_pkt_fields(AVFormat
                  }
              }
  
 -            if (pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE ||
 -                duration) {
 -                /* presentation is not delayed : PTS and DTS are the same */
 -                if (pkt->pts == AV_NOPTS_VALUE)
 -                    pkt->pts = pkt->dts;
 -                update_initial_timestamps(s, pkt->stream_index, pkt->pts,
 -                                          pkt->pts);
 -                if (pkt->pts == AV_NOPTS_VALUE)
 -                    pkt->pts = st->cur_dts;
 -                pkt->dts = pkt->pts;
 -                if (pkt->pts != AV_NOPTS_VALUE)
 -                    st->cur_dts = pkt->pts + duration;
 -            }
 +            /* presentation is not delayed : PTS and DTS are the same */
-             if(pkt->pts == AV_NOPTS_VALUE)
++            if (pkt->pts == AV_NOPTS_VALUE)
 +                pkt->pts = pkt->dts;
-             update_initial_timestamps(s, pkt->stream_index, pkt->pts, pkt->pts);
-             if(pkt->pts == AV_NOPTS_VALUE)
++            update_initial_timestamps(s, pkt->stream_index, pkt->pts,
++                                      pkt->pts);
++            if (pkt->pts == AV_NOPTS_VALUE)
 +                pkt->pts = st->cur_dts;
 +            pkt->dts = pkt->pts;
-             if(pkt->pts != AV_NOPTS_VALUE)
++            if (pkt->pts != AV_NOPTS_VALUE)
 +                st->cur_dts = pkt->pts + duration;
          }
      }
  
Simple merge