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_hflip | |
| 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_hflip')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_hflip | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/lavfi/pixfmts_hflip b/tests/ref/lavfi/pixfmts_hflip index baaf9add77..dfedba816f 100644 --- a/tests/ref/lavfi/pixfmts_hflip +++ b/tests/ref/lavfi/pixfmts_hflip @@ -29,12 +29,12 @@ yuv420p 2d5c80f9ba2ddd85b2aeda3564cc7d64 yuv420p16be 1c4fa93d0744de3cdc6d34ab55db3fb4 yuv420p16le 92c74f5759068c381e4a066fe7faf2e0 yuv422p 6e728f4eb9eae287c224f396d84be6ea -yuv422p16be 69cf0605496c321546899a8442ee64fb -yuv422p16le f0b443fea72f4b6f462859a73b159664 +yuv422p16be a05d43cd62b790087bd37083174557de +yuv422p16le 6954abebcbc62d81068d58d0c62bdd5b yuv440p a99e2b57ed601f39852715c9d675d0d3 yuv444p 947e47f7bb5fdccc659d19b7df2b6fc3 -yuv444p16be bc7d53923cff1d7e98d24540845fb64b -yuv444p16le 5df206a93f85ef8b77f5bdc81d9b0a0b +yuv444p16be 58c012e5ab73b066ef3c2b6411a395f1 +yuv444p16le 32c12794e184042a59738ab2de608c8d yuva420p d83ec0c01498189f179ec574918185f1 yuvj420p df3aaaec3bb157c3bde5f0365af30f4f yuvj422p d113871528d510a192797af59df9c05c |