Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Sep 2012 12:25:21 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Sep 2012 12:44:32 +0000 (14:44 +0200)
commit406cdddbdd229cead581eb1c7b978a2c59453b24
tree0c36c4c2fcafb618ae80074a9a1c07a06872a91f
parent9543cd593ed8249e9885598fc53de163c9d4e2d3
parente52e4fe10d96da4ed26e2acbe3c1ab69485ed75d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/arm/dsputil_arm.S
libavcodec/arm/vp8_armv6.S
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavformat/matroskadec.c
libavformat/utils.c
libavutil/arm/asm.S