• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e4622572
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      applehttp: Properly clean up if unable to probe a segment
      applehttp: Avoid reading uninitialized memory
      fate: Replace misleading "aac" in the name of an ADTS test with "adts".
      fate: Drop pointless "-an" from pictor test command.
      fate: split off image codec FATE tests into their own file
      fate: split off WMA codec FATE tests into their own file
      fate: split off lossless video and audio FATE tests into their own files
      fate: split off qtrle codec FATE tests into their own file
      fate: split off Ut Video codec FATE tests into their own file
      fate: split off screen codec FATE tests into their own file
      fate: split off Real Inc. codec FATE tests into their own file
      fate: split off AC-3 codec FATE tests into their own file
      mpegvideo: remove abort() in ff_find_unused_picture()
      rv40: NEON optimised loop filter strength selection
      rv40: rearrange loop filter functions
      configure: cosmetics: sort some lists where appropriate
      swscale_mmx: drop no longer required parameters from VSCALEX macros
      swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
      build: conditionally compile x86 H.264 chroma optimizations
      v410 encoder and decoder
      ...
    
    Conflicts:
    	Changelog
    	configure
    	doc/developer.texi
    	doc/general.texi
    	libavcodec/arm/asm.S
    	libavcodec/avcodec.h
    	libavcodec/v410dec.c
    	libavcodec/v410enc.c
    	libavcodec/version.h
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil_mmx.c
    	libswscale/x86/swscale_mmx.c
    	tests/Makefile
    	tests/fate2.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e4622572
version.h 4.26 KB