Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Dec 2011 22:58:10 +0000 (23:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Dec 2011 22:58:10 +0000 (23:58 +0100)
commite462257242fc037c99206457d1316e1ff9e5306f
tree045910517a8b587f7a016b1c46403e1d1021f4f2
parenta1be5bc79d7ac4c7c7ed79c4d72b4f1945ecb55c
parent115a57302a7d6661426304bec3a5bc72d0edf4b0
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
22 files changed:
Makefile
configure
doc/general.texi
libavcodec/arm/asm.S
libavcodec/avcodec.h
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv40.c
libavcodec/rv40dsp.c
libavcodec/vc1dec.c
libavcodec/version.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavformat/applehttp.c
library.mak
libswscale/x86/scale.asm
libswscale/x86/swscale_mmx.c
tests/Makefile
tests/fate.mak
tests/fate2.mak