• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · faba79e0
    Michael Niedermayer authored
    * qatar/master:
      mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
      H.264: tweak some other x86 asm for Atom
      probe: Fix insane flow control.
      mpegts: remove invalid error check
      s302m: use nondeprecated audio sample format API
      lavc: use designated initialisers for all codecs.
      x86: cabac: add operand size suffixes missing from 6c325765
    
    Conflicts:
    	libavcodec/ac3enc_float.c
    	libavcodec/flacenc.c
    	libavcodec/frwu.c
    	libavcodec/pictordec.c
    	libavcodec/qtrleenc.c
    	libavcodec/v210enc.c
    	libavcodec/wmv2dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    faba79e0
fraps.c 12.1 KB