Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Factorize declaration of mb_sizes array.
  vsrc_buffer: when no frame is available, return an error instead of segfaulting.
  configure: add dl to frei0r extralibs.
  dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
  dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
  vp8dsp x86: perform rounding shift with a single instruction
  fate: add BMP tests.
  swscale: handle complete dimensions for monoblack/white.
  aacenc: Mark deinterleave_input_samples argument as const.
  vf_unsharp: Mark readonly variable as const.
  h264: fix 4:2:2 PCM-macroblocks decoding

Conflicts:
	configure
	libavcodec/h264.h
	libavcodec/x86/dsputil_mmx.c
	libavfilter/vf_unsharp.c

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

15 files changed, 68 insertions, 0 deletions

diff --git a/tests/Makefile b/tests/Makefile
index b5e0568b10..f2c5ca8474 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -46,6 +46,7 @@ include $(SRC_PATH)/tests/fate/amrnb.mak
 include $(SRC_PATH)/tests/fate/amrwb.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
+include $(SRC_PATH)/tests/fate/bmp.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/dct.mak
 include $(SRC_PATH)/tests/fate/demux.mak
diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak
new file mode 100644
index 0000000000..56b5059a33
--- /dev/null
+++ b/tests/fate/bmp.mak
@@ -0,0 +1,41 @@
+FATE_BMP += fate-bmp-1bit
+fate-bmp-1bit: CMD = framecrc -i $(SAMPLES)/bmp/test1.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-4bit
+fate-bmp-4bit: CMD = framecrc -i $(SAMPLES)/bmp/test4.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-4bit-os2
+fate-bmp-4bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test4os2v2.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-8bit
+fate-bmp-8bit: CMD = framecrc -i $(SAMPLES)/bmp/test8.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-8bit-os2
+fate-bmp-8bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test8os2.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-15bit
+fate-bmp-15bit: CMD = framecrc -i $(SAMPLES)/bmp/test16.bmp -pix_fmt rgb555le
+
+FATE_BMP += fate-bmp-15bit-mask
+fate-bmp-15bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf555.bmp -pix_fmt rgb555le
+
+FATE_BMP += fate-bmp-16bit-mask
+fate-bmp-16bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le
+
+FATE_BMP += fate-bmp-24bit
+fate-bmp-24bit: CMD = framecrc -i $(SAMPLES)/bmp/test24.bmp
+
+FATE_BMP += fate-bmp-32bit
+fate-bmp-32bit: CMD = framecrc -i $(SAMPLES)/bmp/test32.bmp -pix_fmt bgr24
+
+FATE_BMP += fate-bmp-32bit-mask
+fate-bmp-32bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test32bf.bmp -pix_fmt bgr24
+
+FATE_BMP += fate-bmp-rle4
+fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24
+
+FATE_BMP += fate-bmp-rle8
+fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24
+
+FATE_TESTS += $(FATE_BMP)
+fate-bmp: $(FATE_BMP)
diff --git a/tests/ref/fate/bmp-15bit b/tests/ref/fate/bmp-15bit
new file mode 100644
index 0000000000..a0f3bbf1db
--- /dev/null
+++ b/tests/ref/fate/bmp-15bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16256, 0xdbcf881d
diff --git a/tests/ref/fate/bmp-15bit-mask b/tests/ref/fate/bmp-15bit-mask
new file mode 100644
index 0000000000..a0f3bbf1db
--- /dev/null
+++ b/tests/ref/fate/bmp-15bit-mask
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16256, 0xdbcf881d
diff --git a/tests/ref/fate/bmp-16bit-mask b/tests/ref/fate/bmp-16bit-mask
new file mode 100644
index 0000000000..afa5ab4591
--- /dev/null
+++ b/tests/ref/fate/bmp-16bit-mask
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16256, 0x44675948
diff --git a/tests/ref/fate/bmp-1bit b/tests/ref/fate/bmp-1bit
new file mode 100644
index 0000000000..1c825b1498
--- /dev/null
+++ b/tests/ref/fate/bmp-1bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x4c968301
diff --git a/tests/ref/fate/bmp-24bit b/tests/ref/fate/bmp-24bit
new file mode 100644
index 0000000000..8f1a615a9c
--- /dev/null
+++ b/tests/ref/fate/bmp-24bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-32bit b/tests/ref/fate/bmp-32bit
new file mode 100644
index 0000000000..8f1a615a9c
--- /dev/null
+++ b/tests/ref/fate/bmp-32bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-32bit-mask b/tests/ref/fate/bmp-32bit-mask
new file mode 100644
index 0000000000..8f1a615a9c
--- /dev/null
+++ b/tests/ref/fate/bmp-32bit-mask
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-4bit b/tests/ref/fate/bmp-4bit
new file mode 100644
index 0000000000..c0eedf1948
--- /dev/null
+++ b/tests/ref/fate/bmp-4bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x322d81f4
diff --git a/tests/ref/fate/bmp-4bit-os2 b/tests/ref/fate/bmp-4bit-os2
new file mode 100644
index 0000000000..8a5f6589c2
--- /dev/null
+++ b/tests/ref/fate/bmp-4bit-os2
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    19800, 0x563b599a
diff --git a/tests/ref/fate/bmp-8bit b/tests/ref/fate/bmp-8bit
new file mode 100644
index 0000000000..887113cdb5
--- /dev/null
+++ b/tests/ref/fate/bmp-8bit
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0xa7aa6b9b
diff --git a/tests/ref/fate/bmp-8bit-os2 b/tests/ref/fate/bmp-8bit-os2
new file mode 100644
index 0000000000..887113cdb5
--- /dev/null
+++ b/tests/ref/fate/bmp-8bit-os2
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0xa7aa6b9b
diff --git a/tests/ref/fate/bmp-rle4 b/tests/ref/fate/bmp-rle4
new file mode 100644
index 0000000000..c0eedf1948
--- /dev/null
+++ b/tests/ref/fate/bmp-rle4
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0x322d81f4
diff --git a/tests/ref/fate/bmp-rle8 b/tests/ref/fate/bmp-rle8
new file mode 100644
index 0000000000..887113cdb5
--- /dev/null
+++ b/tests/ref/fate/bmp-rle8
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    24384, 0xa7aa6b9b