• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2330eb14
    Michael Niedermayer authored
    * qatar/master:
      arm: intreadwrite: disable inline asm for gcc 4.7 and later
      arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later
      indeo3: fix motion vector validation
      pcm_bluray: set bits_per_raw_sample for > 16-bit
      twinvq: fix out of bounds array access
      lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/indeo3.c
    	libavcodec/pcm-mpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2330eb14
twinvq.c 38.4 KB