• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bf8bb943
    Michael Niedermayer authored
    * qatar/master:
      ffmpeg: get rid of the -vglobal option.
      dct32: Add AVX implementation of 32-point DCT
      dct32: Change pass 6 permutation to allow for AVX implementation
      dct32: port SSE 32-point DCT to YASM
      multiple inclusion guard cleanup
      avio: document buffer must created with av_malloc() and friends
      avio: check AVIOContext malloc failure
      swscale: point out an alternative to sws_getContext
      svq3: Do initialization after parsing the extradata
      add changelog entries for 0.7_beta2
      mp3lame: add #include required for AV_RB32 macro.
    
    Conflicts:
    	Changelog
    	libavcodec/svq3.c
    	libavcodec/x86/dct32_sse.c
    	libavfilter/vsrc_buffer.h
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    bf8bb943