• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 406cdddb
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    406cdddb
asm.S 7.29 KB