• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d77294c5
    Michael Niedermayer authored
    * qatar/master:
      libx264: fix indentation.
      vorbis: fix overflows in floor1[] vector and inverse db table index.
      win64: add a XMM clobber test configure option.
      movdec: Parse the dvc1 atom
      ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
      swscale: K&R formatting cosmetics for Blackfin code
      frwu: lowercase the FRWU codec name
      movdec: fix dts generation in fragmented files
      fate: make acodec-ac3_fixed test output raw AC3
      APIchanges: add missing commit hashes
      swscale: implement MMX, SSE2 and AVX functions for RGB32 input.
      ra144enc: drop pointless "encoder" from .long_name
      bethsoftvideo: fix palette reading.
      mpc7: use av_fast_padded_malloc()
      mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes
      doc: decoding Forward Uncompressed is supported
      Fix a typo in the x86 asm version of ff_vector_clip_int32()
      pcmenc: Do not set avpkt->size.
      ff_alloc_packet: modify the size of the packet to match the requested size
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/libx264.c
    	libavcodec/mpc7.c
    	libavformat/isom.h
    	libswscale/Makefile
    	libswscale/bfin/yuv2rgb_bfin.c
    	tests/ref/fate/bethsoft-vid
    	tests/ref/seek/ac3_ac3
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d77294c5
internal.h 4.07 KB