diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 01:49:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 05:13:56 +0200 |
| commit | f97faf67510d92c2a18180a6ec80435d5dd1da0b (patch) | |
| tree | b63cb9b8a5fc5bafa6963c07c712dbbdf419a175 /tests/ref/lavfi/pixfmts_scale | |
| parent | 9e8dff90efa3faae5ac07fa5fae7e154367e24fd (diff) | |
| parent | e71ebb19722bd2b46831d0ec311b757a56340617 (diff) | |
| download | ffmpeg-f97faf67510d92c2a18180a6ec80435d5dd1da0b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
VC1: restore mistakenly removed code
twinvq: check output buffer size before decoding
twinvq: return an error when the packet size is too small
lavf: export some forgotten symbols with non-av prefixes.
swscale: update altivec yuv2planeX asm to new per-plane API.
swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
yuv2planeX10 SIMD
swscale: decide whether to use yuv2plane1/X on a per-plane basis.
swscale: reintroduce full precision in 16-bit output.
Split up yuv2yuvX functions
Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
lavc: translate non-flag-based er options into flag-based ef options at codec open
add -err_filter AVOptions to access flag-based error recognition
h264_weight: initialize "height" function argument properly.
presets: spelling error in libvpx 1080p50_60
avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X
Conflicts:
ffplay.c
libavformat/libavformat.v
libswscale/swscale.c
libswscale/x86/swscale_template.c
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index e17544dbe6..f843a3eeac 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -33,23 +33,23 @@ yuv411p 1143e7c5cc28fe0922b051b17733bc4c yuv420p fdad2d8df8985e3d17e73c71f713cb14 yuv420p10be 6d335e75b553da590135cf8bb999610c yuv420p10le d510ddbabefd03ef39ec943fcb51b709 -yuv420p16be 2a75942af24fbdc1fdfe189c6e7bf589 -yuv420p16le c4264d92a7c273967a778f4f5daddbe3 +yuv420p16be 31988e9a5d6acacaa710f67bc1172f3a +yuv420p16le f5390ce399f88e0e4e2621ed7833b250 yuv420p9be ec4983b7a949c0472110a7a2c58e278a yuv420p9le c136dce5913a722eee44ab72cff664b2 yuv422p 918e37701ee7377d16a8a6c119c56a40 yuv422p10be cea7ca6b0e66d6f29539885896c88603 yuv422p10le a10c4a5837547716f13cd61918b145f9 -yuv422p16be 285993ee0c0f4f8e511ee46f93c5f38c -yuv422p16le 61bfcee8e54465f760164f5a75d40b5e +yuv422p16be e7e34fe9264784763ab6cb406524c0f3 +yuv422p16le c435b76b08204dda6908640fb5fd4621 yuv422p9be 82494823944912f73cebc58ad2979bbd yuv422p9le fc69c8a21f473916a4b4225636b97e06 yuv440p 461503fdb9b90451020aa3b25ddf041c yuv444p 81b2eba962d12e8d64f003ac56f6faf2 yuv444p10be e9d3c8e744b8b0d8187ca092fa203fc9 yuv444p10le 02f0a336e9da062a64df1ba487e102c5 -yuv444p16be 2677f3074d255f9dab625e9e2e092ca5 -yuv444p16le 65fa92521ef97088599ea83f9508cd5b +yuv444p16be 0da9bed80f5542682ab286f3261cf24c +yuv444p16le a0c5d3c7bf3f181db503cf8e450d1335 yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 yuva420p 8673a9131fb47de69788863f93a50eb7 |