diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 02:50:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 03:50:41 +0100 |
| commit | dd3ca3ea15392da8636c06764e2da31e6ca700f0 (patch) | |
| tree | 97d3fc3bdb9463a99728e14d3cd4a0062aa3af19 /tests/ref/lavfi/pixdesc | |
| parent | 4805a33043e9356fc344aa53c7df747d41ce6b37 (diff) | |
| parent | a67b8c86d06eb5b78a0fe4cb9be4e93b29726db1 (diff) | |
| download | ffmpeg-dd3ca3ea15392da8636c06764e2da31e6ca700f0.tar.gz | |
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>
Diffstat (limited to 'tests/ref/lavfi/pixdesc')
| -rw-r--r-- | tests/ref/lavfi/pixdesc | 4 |
1 files changed, 4 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 |