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>

20 files changed, 27 insertions, 76 deletions

diff --git a/tests/ref/seek/ac3_ac3 b/tests/ref/seek/ac3_ac3
deleted file mode 100644
index 167dc8d716..0000000000
--- a/tests/ref/seek/ac3_ac3
+++ /dev/null
@@ -1,49 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880400 pts: 1.880400 pos:  30092 size:   558
-ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 0 flags:1 dts: 0.800911 pts: 0.800911 pos:  12818 size:   556
-ret:-1         st: 0 flags:1  ts:-0.317500
-ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.576844 pts: 2.576844 pos:  41238 size:   558
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.462533 pts: 1.462533 pos:  23406 size:   556
-ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.383044 pts: 0.383044 pos:   6130 size:   558
-ret:-1         st: 0 flags:1  ts:-0.740833
-ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.158978 pts: 2.158978 pos:  34552 size:   556
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.044667 pts: 1.044667 pos:  16718 size:   558
-ret: 0         st: 0 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
-ret: 0         st: 0 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 2.820600 pts: 2.820600 pos:  45140 size:   556
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.741111 pts: 1.741111 pos:  27864 size:   556
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.591978 pts: 0.591978 pos:   9474 size:   556
-ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
-ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:1 dts: 2.402733 pts: 2.402733 pos:  38452 size:   558
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.323244 pts: 1.323244 pos:  21176 size:   558
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.174111 pts: 0.174111 pos:   2786 size:   558
-ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
-ret: 0         st: 0 flags:1  ts: 1.989178
-ret: 0         st: 0 flags:1 dts: 1.984867 pts: 1.984867 pos:  31764 size:   558
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.905378 pts: 0.905378 pos:  14488 size:   558
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.681311 pts: 2.681311 pos:  42910 size:   558
-ret: 0         st: 0 flags:1  ts: 1.565844
-ret: 0         st: 0 flags:1 dts: 1.532178 pts: 1.532178 pos:  24520 size:   558
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.487511 pts: 0.487511 pos:   7802 size:   556
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/adpcm_qt_aiff b/tests/ref/seek/adpcm_ima_qt_aiff
index bdaf1f0f0c..bdaf1f0f0c 100644
--- a/tests/ref/seek/adpcm_qt_aiff
+++ b/tests/ref/seek/adpcm_ima_qt_aiff
diff --git a/tests/ref/seek/adpcm_ima_wav b/tests/ref/seek/adpcm_ima_wav_wav
index b6517c5438..b6517c5438 100644
--- a/tests/ref/seek/adpcm_ima_wav
+++ b/tests/ref/seek/adpcm_ima_wav_wav
diff --git a/tests/ref/seek/adpcm_yam_wav b/tests/ref/seek/adpcm_yamaha_wav
index 5cbfaed73e..5cbfaed73e 100644
--- a/tests/ref/seek/adpcm_yam_wav
+++ b/tests/ref/seek/adpcm_yamaha_wav
diff --git a/tests/ref/seek/alac_m4a b/tests/ref/seek/alac_mov
index 51e23e1dd4..a281d2e249 100644
--- a/tests/ref/seek/alac_m4a
+++ b/tests/ref/seek/alac_mov
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.857596 pts: 1.857596 pos:  73651 size:  4961
+ret: 0         st: 0 flags:1 dts: 1.857596 pts: 1.857596 pos:  73647 size:  4961
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.835918 pts: 0.835918 pos:  29036 size:  3194
+ret: 0         st: 0 flags:1 dts: 0.835918 pts: 0.835918 pos:  29032 size:  3194
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.600635 pts: 2.600635 pos: 137557 size: 12843
+ret: 0         st: 0 flags:1 dts: 2.600635 pts: 2.600635 pos: 137553 size: 12843
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos:  50159 size:  4414
+ret: 0         st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos:  50155 size:  4414
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos:  12946 size:  3209
+ret: 0         st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos:  12942 size:  3209
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.229116 pts: 2.229116 pos: 100935 size:  7896
+ret: 0         st: 0 flags:1 dts: 2.229116 pts: 2.229116 pos: 100931 size:  7896
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.021678 pts: 1.021678 pos:  35318 size:  3031
+ret: 0         st: 0 flags:1 dts: 1.021678 pts: 1.021678 pos:  35314 size:  3031
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.786395 pts: 2.786395 pos: 163180 size: 12765
+ret: 0         st: 0 flags:1 dts: 2.786395 pts: 2.786395 pos: 163176 size: 12765
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.764717 pts: 1.764717 pos:  68680 size:  4971
+ret: 0         st: 0 flags:1 dts: 1.764717 pts: 1.764717 pos:  68676 size:  4971
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos:  19341 size:  3234
+ret: 0         st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos:  19337 size:  3234
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.321995 pts: 2.321995 pos: 108831 size:  7886
+ret: 0         st: 0 flags:1 dts: 2.321995 pts: 2.321995 pos: 108827 size:  7886
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos:  50159 size:  4414
+ret: 0         st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos:  50155 size:  4414
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos:   6470 size:  3245
+ret: 0         st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos:   6466 size:  3245
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos:  78612 size:  6514
+ret: 0         st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos:  78608 size:  6514
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  32230 size:  3088
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  32226 size:  3088
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.693515 pts: 2.693515 pos: 150400 size: 12780
+ret: 0         st: 0 flags:1 dts: 2.693515 pts: 2.693515 pos: 150396 size: 12780
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.486077 pts: 1.486077 pos:  54573 size:  4554
+ret: 0         st: 0 flags:1 dts: 1.486077 pts: 1.486077 pos:  54569 size:  4554
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.464399 pts: 0.464399 pos:  16155 size:  3186
+ret: 0         st: 0 flags:1 dts: 0.464399 pts: 0.464399 pos:  16151 size:  3186
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  3236
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:  3236
diff --git a/tests/ref/seek/dv411_dv b/tests/ref/seek/dv_411_dv
index d318794157..d318794157 100644
--- a/tests/ref/seek/dv411_dv
+++ b/tests/ref/seek/dv_411_dv
diff --git a/tests/ref/seek/dv50_dv b/tests/ref/seek/dv_50_dv
index fae6d1b225..fae6d1b225 100644
--- a/tests/ref/seek/dv50_dv
+++ b/tests/ref/seek/dv_50_dv
diff --git a/tests/ref/seek/mpeg1_mpg b/tests/ref/seek/mpeg1_mpeg1video
index 54f0b166b9..54f0b166b9 100644
--- a/tests/ref/seek/mpeg1_mpg
+++ b/tests/ref/seek/mpeg1_mpeg1video
diff --git a/tests/ref/seek/mpeg1b_mpg b/tests/ref/seek/mpeg1b_mpeg1video
index 4c83997934..4c83997934 100644
--- a/tests/ref/seek/mpeg1b_mpg
+++ b/tests/ref/seek/mpeg1b_mpeg1video
diff --git a/tests/ref/seek/mpeg2_422_mpg b/tests/ref/seek/mpeg2_422_mpeg2video
index 3b4e1e7d14..3b4e1e7d14 100644
--- a/tests/ref/seek/mpeg2_422_mpg
+++ b/tests/ref/seek/mpeg2_422_mpeg2video
diff --git a/tests/ref/seek/mpeg2_idct_int_mpg b/tests/ref/seek/mpeg2_idct_int_mpeg2video
index b096f6fe7c..b096f6fe7c 100644
--- a/tests/ref/seek/mpeg2_idct_int_mpg
+++ b/tests/ref/seek/mpeg2_idct_int_mpeg2video
diff --git a/tests/ref/seek/mpeg2i_mpg b/tests/ref/seek/mpeg2_ilace_mpeg2video
index 0708cfd7b3..0708cfd7b3 100644
--- a/tests/ref/seek/mpeg2i_mpg
+++ b/tests/ref/seek/mpeg2_ilace_mpeg2video
diff --git a/tests/ref/seek/mpeg2ivlc_qprd_mpg b/tests/ref/seek/mpeg2_ivlc_qprd_mpeg2video
index 330dc16a47..330dc16a47 100644
--- a/tests/ref/seek/mpeg2ivlc_qprd_mpg
+++ b/tests/ref/seek/mpeg2_ivlc_qprd_mpeg2video
diff --git a/tests/ref/seek/mpeg2threadivlc_mpg b/tests/ref/seek/mpeg2_thread_ivlc_mpeg2video
index c2f9895ab5..c2f9895ab5 100644
--- a/tests/ref/seek/mpeg2threadivlc_mpg
+++ b/tests/ref/seek/mpeg2_thread_ivlc_mpeg2video
diff --git a/tests/ref/seek/mpeg2thread_mpg b/tests/ref/seek/mpeg2_thread_mpeg2video
index 24ee04f718..24ee04f718 100644
--- a/tests/ref/seek/mpeg2thread_mpg
+++ b/tests/ref/seek/mpeg2_thread_mpeg2video
diff --git a/tests/ref/seek/error_mpeg4_adv_avi b/tests/ref/seek/mpeg4_error_avi
index 3c6fa21e7c..3c6fa21e7c 100644
--- a/tests/ref/seek/error_mpeg4_adv_avi
+++ b/tests/ref/seek/mpeg4_error_avi
diff --git a/tests/ref/seek/odivx_mp4 b/tests/ref/seek/mpeg4_mp4
index 0600ed0273..0600ed0273 100644
--- a/tests/ref/seek/odivx_mp4
+++ b/tests/ref/seek/mpeg4_mp4
diff --git a/tests/ref/seek/mpeg4_Q_avi b/tests/ref/seek/mpeg4_qpel_avi
index 1bb15046f9..1bb15046f9 100644
--- a/tests/ref/seek/mpeg4_Q_avi
+++ b/tests/ref/seek/mpeg4_qpel_avi
diff --git a/tests/ref/seek/roqav_roq b/tests/ref/seek/roqvideo_roq
index d003a37404..d003a37404 100644
--- a/tests/ref/seek/roqav_roq
+++ b/tests/ref/seek/roqvideo_roq
diff --git a/tests/ref/seek/snow53_avi b/tests/ref/seek/snow_ll_avi
index 5eb0ba0799..5eb0ba0799 100644
--- a/tests/ref/seek/snow53_avi
+++ b/tests/ref/seek/snow_ll_avi