Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 May 2012 23:39:24 +0000 (01:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 May 2012 23:40:54 +0000 (01:40 +0200)
commitb0387edd5e766b1032f946d6cdb35b765bb45435
treedd3ca8577a8d3b05efee8b1214a80f845ddeb47f
parent8619362ff1de6605ffe6da8a42bdfe4fb7be75c1
parentf919cc7df6ab844bc12f89fe7bef4fb915a47725
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>
105 files changed:
configure
libavcodec/pcm-mpeg.c
libavcodec/x86/fft_mmx.asm
libavformat/g723_1.c
libavformat/http.c
libavformat/http.h
libavutil/x86/x86util.asm
tests/Makefile
tests/fate-run.sh
tests/fate/aac.mak
tests/fate/ac3.mak
tests/fate/acodec.mak
tests/fate/audio.mak
tests/fate/vcodec.mak
tests/ref/fate/acodec-adpcm-ima_qt
tests/ref/fate/acodec-adpcm_ima_qt
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-aref
tests/ref/fate/acodec-dca
tests/ref/fate/acodec-flac
tests/ref/fate/acodec-g723_1
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/fate/acodec-ra144
tests/ref/fate/acodec-roqaudio
tests/ref/fate/vsynth1-amv
tests/ref/fate/vsynth1-avui
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-dnxhd-1080i
tests/ref/fate/vsynth1-dnxhd_1080i
tests/ref/fate/vsynth1-dv
tests/ref/fate/vsynth1-dv-411
tests/ref/fate/vsynth1-dv-50
tests/ref/fate/vsynth1-dv_411
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-flashsv
tests/ref/fate/vsynth1-flashsv2
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-j2k
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mpeg4
tests/ref/fate/vsynth1-mpng
tests/ref/fate/vsynth1-msvideo1
tests/ref/fate/vsynth1-prores
tests/ref/fate/vsynth1-prores_kostya
tests/ref/fate/vsynth1-qtrle
tests/ref/fate/vsynth1-qtrlegray
tests/ref/fate/vsynth1-r210
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-svq1
tests/ref/fate/vsynth1-v308
tests/ref/fate/vsynth1-v408
tests/ref/fate/vsynth1-y41p
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth1-yuv4
tests/ref/fate/vsynth1-zlib
tests/ref/fate/vsynth1-zmbv
tests/ref/fate/vsynth2-amv
tests/ref/fate/vsynth2-avui
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-dnxhd-1080i
tests/ref/fate/vsynth2-dnxhd_1080i
tests/ref/fate/vsynth2-dv
tests/ref/fate/vsynth2-dv-411
tests/ref/fate/vsynth2-dv-50
tests/ref/fate/vsynth2-dv_411
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-flashsv
tests/ref/fate/vsynth2-flashsv2
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-j2k
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mpeg4
tests/ref/fate/vsynth2-mpng
tests/ref/fate/vsynth2-msvideo1
tests/ref/fate/vsynth2-prores
tests/ref/fate/vsynth2-prores_kostya
tests/ref/fate/vsynth2-qtrle
tests/ref/fate/vsynth2-qtrlegray
tests/ref/fate/vsynth2-r210
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-svq1
tests/ref/fate/vsynth2-v308
tests/ref/fate/vsynth2-v408
tests/ref/fate/vsynth2-y41p
tests/ref/fate/vsynth2-yuv
tests/ref/fate/vsynth2-yuv4
tests/ref/fate/vsynth2-zlib
tests/ref/fate/vsynth2-zmbv
tests/ref/seek/dv_411_dv
tests/ref/seek/dv_50_dv
tests/ref/seek/mpeg1_mpeg1video
tests/ref/seek/mpeg1b_mpeg1video
tests/ref/seek/mpeg2_422_mpeg2video
tests/ref/seek/mpeg2_idct_int_mpeg2video
tests/ref/seek/mpeg2_ilace_mpeg2video
tests/ref/seek/mpeg2_ivlc_qprd_mpeg2video
tests/ref/seek/mpeg2_thread_ivlc_mpeg2video
tests/ref/seek/mpeg2_thread_mpeg2video
tests/regression-funcs.sh
tests/rotozoom.c
tests/utils.c
tests/videogen.c