Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add tests for more AAC features.
  aacps: Add missing newline in error message.
  fate: Add tests for vc1/wmapro in ism.
  aacdec: Add a fate test for 5.1 channel SBR.
  aacdec: Turn off PS for multichannel files that use PCE based configs.
  cabac: remove put_cabac_u/ueg from cabac-test.
  swscale: RGB4444 and BGR444 input
  FATE: add test for xWMA demuxer.
  FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
  mpegaudiodec: optimized iMDCT transform
  mpegaudiodec: change imdct window arrangment for better pointer alignment
  mpegaudiodec: move imdct and windowing function to mpegaudiodsp
  mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
  swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
  FATE: test to exercise WTV demuxer.
  mjpegdec: K&R formatting cosmetics
  swscale: K&R formatting cosmetics for code examples
  swscale: K&R reformatting cosmetics for header files
  FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.

Conflicts:
	libavcodec/cabac.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegaudiodsp.c
	libavcodec/mpegaudiodsp.h
	libavcodec/mpegaudiodsp_template.c
	libavcodec/x86/Makefile
	libavcodec/x86/imdct36_sse.asm
	libavcodec/x86/mpegaudiodec_mmx.c
	libswscale/swscale-test.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/fate/demux.mak
	tests/fate/microsoft.mak
	tests/fate/video.mak
	tests/fate/wma.mak
	tests/ref/lavfi/pixfmts_scale

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

5 files changed, 20 insertions, 0 deletions

diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc
index 07d1d36417..f5e398e560 100644
--- a/tests/ref/lavfi/pixdesc
+++ b/tests/ref/lavfi/pixdesc
@@ -4,6 +4,8 @@ abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr0                0ef8ffe42bfe53be74973a0c118b775e
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
+bgr444be            d9ea9307d21b162225b8b2c524cf9477
+bgr444le            88035350e9da3a8f67387890b956f0bc
 bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
 bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
@@ -22,6 +24,8 @@ nv12                e0af357888584d36eec5aa0f673793ef
 nv21                9a3297f3b34baa038b1f37cb202b512f
 rgb0                7c03f81f5e5346bf8ea42c4187f20605
 rgb24               b41eba9651e1b5fe386289b506188105
+rgb444be            9e89db334568c6b2e3d5d0540f4ba960
+rgb444le            0a68cb6de8bf530aa30c5c1205c25155
 rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
 rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy
index 5ced4785c8..11ed0238ed 100644
--- a/tests/ref/lavfi/pixfmts_copy
+++ b/tests/ref/lavfi/pixfmts_copy
@@ -4,6 +4,8 @@ abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr0                328a76e72c55508cdf04dc93a5b056fc
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
+bgr444be            d9ea9307d21b162225b8b2c524cf9477
+bgr444le            88035350e9da3a8f67387890b956f0bc
 bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
 bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
@@ -23,6 +25,8 @@ nv21                9a3297f3b34baa038b1f37cb202b512f
 pal8                dec8ed2258ec89b8a796f21cad4df867
 rgb0                ff1a9f355d43f9d25f07a191b5aa906c
 rgb24               b41eba9651e1b5fe386289b506188105
+rgb444be            9e89db334568c6b2e3d5d0540f4ba960
+rgb444le            0a68cb6de8bf530aa30c5c1205c25155
 rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
 rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null
index 5ced4785c8..11ed0238ed 100644
--- a/tests/ref/lavfi/pixfmts_null
+++ b/tests/ref/lavfi/pixfmts_null
@@ -4,6 +4,8 @@ abgr                037bf9df6a765520ad6d490066bf4b89
 argb                c442a8261c2265a07212ef0f72e35f5a
 bgr0                328a76e72c55508cdf04dc93a5b056fc
 bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
+bgr444be            d9ea9307d21b162225b8b2c524cf9477
+bgr444le            88035350e9da3a8f67387890b956f0bc
 bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
 bgr48le             d02c235ebba7167881ca2d576497ff84
 bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
@@ -23,6 +25,8 @@ nv21                9a3297f3b34baa038b1f37cb202b512f
 pal8                dec8ed2258ec89b8a796f21cad4df867
 rgb0                ff1a9f355d43f9d25f07a191b5aa906c
 rgb24               b41eba9651e1b5fe386289b506188105
+rgb444be            9e89db334568c6b2e3d5d0540f4ba960
+rgb444le            0a68cb6de8bf530aa30c5c1205c25155
 rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
 rgb48le             86c5608904f75360d492dbc5c9589969
 rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale
index 597904d02c..f45295128d 100644
--- a/tests/ref/lavfi/pixfmts_scale
+++ b/tests/ref/lavfi/pixfmts_scale
@@ -4,6 +4,8 @@ abgr                cff82561a074874027ac1cc896fd2730
 argb                756dd1eaa5baca2238ce23dbdc452684
 bgr0                ff6e1dfa26d4c2ada3a59e8b0b600d1f
 bgr24               e44192347a45586c6c157e3059610cd1
+bgr444be            c23768338d76693f0da76e8a9b6fd8df
+bgr444le            846c431a47bfb745437941bde768469c
 bgr48be             390d3058a12a99c2b153ed7922508bea
 bgr48le             39fe06feb4ec1d9730dccc04a0cfac4c
 bgr4_byte           ee1d35a7baf8e9016891929a2f565c0b
@@ -23,6 +25,8 @@ nv21                69c699510ff1fb777b118ebee1002f14
 pal8                6324fa058e1bc157ed7132bfe4022317
 rgb0                1bd6f54ad067503ac9783a70062c8f87
 rgb24               13ff53ebeab74dc05492836f1cfbd2c1
+rgb444be            46e466b2709f62b2fffc63708063eaaf
+rgb444le            f0c57a48be671428e2e53c9b54a6c4e2
 rgb48be             8fac63787a711886030f8e056872b488
 rgb48le             ab92f2763a2eb264c3870cc758f97149
 rgb4_byte           d81ffd3add95842a618eec81024f0b5c
diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip
index 333bd46484..1e9a636291 100644
--- a/tests/ref/lavfi/pixfmts_vflip
+++ b/tests/ref/lavfi/pixfmts_vflip
@@ -4,6 +4,8 @@ abgr                25e72e9dbd01ab00727c976d577f7be5
 argb                19869bf1a5ac0b6af4d8bbe2c104533c
 bgr0                e03d3ee0b977f6d86e5116b20494bef5
 bgr24               89108a4ba00201f79b75b9305c42352d
+bgr444be            9ef12c42fb791948ca4423c452dc6b9a
+bgr444le            3650ecfc163abd1596c0cd29d130c4b0
 bgr48be             2f23931844f57641f3737348182d118c
 bgr48le             4242a026012b6c135a6aa138a6d67031
 bgr4_byte           407fcf564ed764c38e1d748f700ab921
@@ -23,6 +25,8 @@ nv21                01ea369dd2d0d3ed7451dc5c8d61497f
 pal8                47ed19a7e128b0e33c25d2a463b0611a
 rgb0                330bd6168e46c0d5eb4acbdbb50afa2e
 rgb24               eaefabc168d0b14576bab45bc1e56e1e
+rgb444be            06722e03f8404e7d2226665ed2444a32
+rgb444le            185c9a5d9c2877484310d4196ef4cd6f
 rgb48be             62dd185862ed142283bd300eb6dbd216
 rgb48le             dcb76353268bc5862194d131762220da
 rgb4_byte           8c6ff02df0b06dd2d574836c3741b2a2