Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Dec 2011 00:19:04 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Dec 2011 00:19:18 +0000 (01:19 +0100)
* qatar/master:
  fate: split off vqf/twinvq FATE tests into their own file
  fate: split off mpc FATE tests into their own file
  fate: split off libavcodec FATE tests into their own file
  fate: split off Microsoft codec FATE tests into their own file
  fate: group all VP* codec FATE tests together in one file
  swscale: prevent invalid writes in packed_16bpc_bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libswscale/swscale_unscaled.c
tests/Makefile
tests/fate.mak

Simple merge
diff --cc tests/Makefile
@@@ -54,11 -37,13 +54,14 @@@ include $(SRC_PATH)/tests/fate/fft.ma
  include $(SRC_PATH)/tests/fate/h264.mak
  include $(SRC_PATH)/tests/fate/image.mak
  include $(SRC_PATH)/tests/fate/indeo.mak
+ include $(SRC_PATH)/tests/fate/libavcodec.mak
  include $(SRC_PATH)/tests/fate/libavutil.mak
 +include $(SRC_PATH)/tests/fate/mapchan.mak
  include $(SRC_PATH)/tests/fate/lossless-audio.mak
  include $(SRC_PATH)/tests/fate/lossless-video.mak
+ include $(SRC_PATH)/tests/fate/microsoft.mak
  include $(SRC_PATH)/tests/fate/mp3.mak
+ include $(SRC_PATH)/tests/fate/mpc.mak
  include $(SRC_PATH)/tests/fate/prores.mak
  include $(SRC_PATH)/tests/fate/qtrle.mak
  include $(SRC_PATH)/tests/fate/real.mak
diff --cc tests/fate.mak
Simple merge