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/pixfmts_scale | |
| parent | 4805a33043e9356fc344aa53c7df747d41ce6b37 (diff) | |
| parent | a67b8c86d06eb5b78a0fe4cb9be4e93b29726db1 (diff) | |
| download | ffmpeg-streaming-dd3ca3ea15392da8636c06764e2da31e6ca700f0.zip ffmpeg-streaming-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/pixfmts_scale')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 597904d..f452951 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 |
