Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
  fate: list lavfi tests in a makefile

Conflicts:
	configure
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 7aa0107,800f22c..6c8c979
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1943,35 -1710,19 +1943,25 @@@ tinterlace_pad_test_deps="tinterlace_fi
  # libraries
  avdevice_deps="avcodec avformat"
  avformat_deps="avcodec"
 +postproc_deps="gpl"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale
 -             aformat_filter asyncts_filter
 -             format_filter fps_filter scale_filter setpts_filter"
 -avplay_deps="avcodec avformat swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
 -avserver_extralibs='$ldl'
 -
 -doc_deps="texi2html"
 +ffmpeg_deps="avcodec avfilter avformat swscale swresample"
 +ffmpeg_select="ffbuffersink_filter format_filter aformat_filter
 +               setpts_filter null_filter anull_filter ffabuffersink_filter"
 +ffplay_deps="avcodec avformat swscale swresample sdl"
 +ffplay_select="ffbuffersink_filter rdft crop_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
 +ffserver_extralibs='$ldl'
 +
 +# documentation
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="texi2html"
 +txtpages_deps="makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
- # tests
- colormatrix1_test_deps="colormatrix_filter"
- colormatrix2_test_deps="colormatrix_filter"
- pp_test_deps="mp_filter"
- pp2_test_deps="mp_filter"
- pp3_test_deps="mp_filter"
- pp4_test_deps="mp_filter"
- pp5_test_deps="mp_filter"
- pp6_test_deps="mp_filter"
- 
  # default parameters
  
  logfile="config.log"
@@@ -2137,15 -1872,6 +2127,14 @@@ ALL_COMPONENTS=
      $PROTOCOL_LIST
  "
  
- LAVFI_TESTS=$(find_tests lavfi)
 +find_tests(){
 +    map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]')
 +}
 +
 +LAVF_FATE_TESTS=$(find_tests lavf-fate)
- ALL_TESTS="$LAVF_FATE_TESTS $LAVFI_TESTS"
 +
++ALL_TESTS="$LAVF_FATE_TESTS"
 +
  for n in $COMPONENT_LIST; do
      v=$(toupper ${n%s})_LIST
      eval enable \$$v
@@@ -4290,13 -3771,7 +4279,12 @@@ print_config CONFIG_ "$config_files" $C
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \
  
 -echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
 +cat >>config.mak <<EOF
 +LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS)
- LAVFI_TESTS=$(print_enabled  -n _test $LAVFI_TESTS)
 +EOF
 +
 +echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 +echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
  
  # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
  cp_if_changed $TMPH config.h

diff --cc libavcodec/mips/mathops.h
Simple merge

diff --cc tests/Makefile
index 6d5df66,d3b4bcb..e358fbd
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -110,14 -86,8 +111,11 @@@ include $(SRC_PATH)/tests/fate/vqf.ma
  include $(SRC_PATH)/tests/fate/wavpack.mak
  include $(SRC_PATH)/tests/fate/wma.mak
  
 -FATE_AVCONV += $(FATE_AVCONV-yes)
 -FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
 +FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)
- FATE_LAVFI   = $(LAVFI_TESTS:%=fate-lavfi-%)
- 
- FATE_AVCONV += $(FATE_LAVFI)                                            \
 +
 +FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
 +FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
 +FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
  
  FATE-$(CONFIG_AVCODEC)  += $(FATE_LIBAVCODEC)
  FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
@@@ -128,30 -98,16 +126,26 @@@ FATE_EXTERN += $(FATE_EXTERN-yes
  FATE += $(FATE-yes)
  FATE += $(FATE_LIBAVUTIL)
  
 -$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
 +$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)
 +
 +$(FATE_FFPROBE): ffprobe$(EXESUF)
 +
- $(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
- 
 +$(FATE_LAVF_FATE): CMD = lavffatetest
- $(FATE_LAVFI):   CMD = lavfitest
 +
 +fate-lavf-fate: $(FATE_LAVF_FATE)
- fate-lavfi:  $(FATE_LAVFI)
  
  ifdef SAMPLES
 -FATE += $(FATE_SAMPLES)
 +FATE += $(FATE_LAVF_FATE)
 +FATE += $(FATE_FULL) $(FATE_FULL-yes)
 +FATE += $(FATE_EXTERN)
  fate-rsync:
 -      rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
 +      rsync -vaLW --timeout=60 --contimeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
  else
 +fate::
 +      @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
  fate-rsync:
        @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
 -$(FATE_SAMPLES):
 +$(FATE_EXTERN):
        @echo "$@ requires external samples and SAMPLES not specified"; false
  endif
  

diff --cc tests/fate/avfilter.mak
index 0000000,de5e9d1..3b06d08
mode 000000,100644..100644
--- /dev/null
--- 2/tests/fate/avfilter.mak
+++ b/tests/fate/avfilter.mak
@@@ -1,0 -1,24 +1,58 @@@
 -FATE_LAVFI = fate-lavfi-crop                                            \
++FATE_LAVFI = fate-lavfi-alphaextract_rgb                                \
++             fate-lavfi-alphaextract_yuv                                \
++             fate-lavfi-alphamerge_rgb                                  \
++             fate-lavfi-alphamerge_yuv                                  \
++             fate-lavfi-colormatrix1                                    \
++             fate-lavfi-colormatrix2                                    \
++             fate-lavfi-crop                                            \
+              fate-lavfi-crop_scale                                      \
+              fate-lavfi-crop_scale_vflip                                \
+              fate-lavfi-crop_vflip                                      \
++             fate-lavfi-drawbox                                         \
++             fate-lavfi-edgedetect                                      \
++             fate-lavfi-fade                                            \
++             fate-lavfi-idet                                            \
++             fate-lavfi-life                                            \
+              fate-lavfi-null                                            \
 -             fate-lavfi-pixdesc                                         \
++             fate-lavfi-overlay                                         \
++             fate-lavfi-pad                                             \
+              fate-lavfi-pixfmts_copy                                    \
+              fate-lavfi-pixfmts_crop                                    \
+              fate-lavfi-pixfmts_hflip                                   \
+              fate-lavfi-pixfmts_null                                    \
+              fate-lavfi-pixfmts_pad                                     \
++             fate-lavfi-pixfmts_pixdesctest                             \
+              fate-lavfi-pixfmts_scale                                   \
++             fate-lavfi-pixfmts_super2xsai                              \
+              fate-lavfi-pixfmts_vflip                                   \
+              fate-lavfi-scale200                                        \
+              fate-lavfi-scale500                                        \
++             fate-lavfi-select                                          \
++             fate-lavfi-setdar                                          \
++             fate-lavfi-setsar                                          \
++             fate-lavfi-testsrc                                         \
++             fate-lavfi-thumbnail                                       \
++             fate-lavfi-tile                                            \
++             fate-lavfi-tinterlace_merge                                \
++             fate-lavfi-tinterlace_pad                                  \
++             fate-lavfi-transpose                                       \
++             fate-lavfi-unsharp                                         \
+              fate-lavfi-vflip                                           \
+              fate-lavfi-vflip_crop                                      \
+              fate-lavfi-vflip_vflip                                     \
+ 
++FATE_LAVFI-$(CONFIG_MP_FILTER) += fate-lavfi-pp                         \
++             fate-lavfi-pp2                                             \
++             fate-lavfi-pp3                                             \
++             fate-lavfi-pp4                                             \
++             fate-lavfi-pp5                                             \
++             fate-lavfi-pp6                                             \
++
++FATE_LAVFI += $(FATE_LAVFI-yes)
++
+ $(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
+ $(FATE_LAVFI): CMD = lavfitest
+ 
+ FATE_AVCONV += $(FATE_LAVFI)
+ fate-lavfi:    $(FATE_LAVFI)
++