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)
commitbce42e95d13e3cc9c32bcd75d127c0152e51471d
treeec7e1e19748ce5ee666d2f89aa0fc306d8f462e5
parentb18c9f1eb024abd239c16636f1ef3a9a02d6f262
parent313f9fbfbb5a45eefe4bfe7b04e6c83f9b5f77c7
Merge remote-tracking branch 'qatar/master'

* 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>
configure
libavcodec/vqavideo.c
libavformat/utils.c
libavutil/arm/intreadwrite.h