diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:26:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:31:51 +0200 |
| commit | 1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (patch) | |
| tree | 621f7e9cdf461b997ef614f6c9c4c5657089e471 /tests/ref/fate/filter-pixfmts-lut | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
| download | ffmpeg-streaming-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.zip ffmpeg-streaming-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.tar.gz | |
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
avconv: set the "encoder" tag when transcoding
Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/filter-pixfmts-lut')
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-lut | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/ref/fate/filter-pixfmts-lut b/tests/ref/fate/filter-pixfmts-lut index 387464be2..aae33e3 100644 --- a/tests/ref/fate/filter-pixfmts-lut +++ b/tests/ref/fate/filter-pixfmts-lut @@ -1,19 +1,19 @@ -abgr c1e31c876e806cbfa8ef58441d1dee6f -argb 1239bf03999d8767c2e03863e22955a8 -bgr24 0ed1377b8c34489e716650edb593494d -bgra 87a4b656459a5f8ee2a0e5a994c61439 -rgb24 a1466d9fc7d1726dda3bfe80dfcc1b44 -rgba 980b5fb376926ca9c5a0a5b82a0ab162 -yuv410p ec9e2e31c1c702676362f5445efd4354 -yuv411p 9caecd7961e1011db685cc4d60220fd1 -yuv420p 8796295e7d132dd0f616fed149633ad9 -yuv422p 2a3f79670546a0e582ab00cb83bb3b79 -yuv440p d7e3ffabdb376f49a02cd641907df726 -yuv444p 13ef53a3dd3f77516e2c5237bf43b0c5 -yuva420p 34c07d6c05233f333a933a50a3dbfa61 -yuva422p 352406873ef88f865af0f27760f37663 -yuva444p 8efb7b3d809946fdf01f3c426a6cdf83 -yuvj420p 5a8771944ba995a831ca272526f440e5 -yuvj422p ab379523c4e79ca1e3c72adc46b918ff -yuvj440p 8e82847ed2f7a3a22ebdb2372e941fc4 -yuvj444p 4a98641643a7a51292c61c71e221ddc4 +abgr bd46c89a52d2537001650bacd63b6f1b +argb cd7004e1d6275344e7acf86e3123ecf1 +bgr24 9b9bf5c2ab2e63323c71727a33059a29 +bgra 383b5acf1aad6892ceee5c3c6eca6bc3 +rgb24 2872ce9b649cab79ae45ea2b72e1b036 +rgba ed960ad34326f9135194b445c82304b4 +yuv410p fa5151dd818f84a84535ede55456ffda +yuv411p 1b1a01fbc67c0338cdf0b37577af7752 +yuv420p 15edbd4c31c37c0d1c1cd052a12db3bb +yuv422p 38617d96f7baed36b727da98a939e124 +yuv440p 0cdb9f67fbb9ee9e042aec278aad2d54 +yuv444p 0e0ed93cfa4a791d6264a6fd532097ab +yuva420p c76e834d04020747df3581788b862483 +yuva422p 7d1acdaa7296681cd8df2b7a100f4011 +yuva444p 0950297cd3fecb9078a25decfe1474e8 +yuvj420p 836e8ce8a5c058b373d39342080106f6 +yuvj422p 4e5683c0d8810c561c2f5c6d97a71339 +yuvj440p c3aba7f08d3b758b428fc1b47c0f822b +yuvj444p 21834e89fb1a8ff409e0e72429e55232 |
