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-super2xsai | |
parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) |
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-super2xsai')
-rw-r--r-- | tests/ref/fate/filter-pixfmts-super2xsai | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/ref/fate/filter-pixfmts-super2xsai b/tests/ref/fate/filter-pixfmts-super2xsai index 964d04a318..d06b2bb717 100644 --- a/tests/ref/fate/filter-pixfmts-super2xsai +++ b/tests/ref/fate/filter-pixfmts-super2xsai @@ -1,14 +1,14 @@ -abgr b04e3dfb0043f6eb04a573d2d13052eb -argb 257e33717d23298430025c0665642cd5 -bgr24 3765d88f93d4ae8baa2cfbc64b0b32e1 -bgr555be 81832e6269c509be55bba49bdd0ebed5 -bgr555le 56772e91aefba4013890d156866730ce -bgr565be 0b3c420fbddcec5a420c285b3c4b8792 -bgr565le 6cbded26d2bab8204afe2115384c09a8 -bgra c81430c3d1465e37b6acaa19cc54e932 -rgb24 9899359a817e705dc5b9cc363d35a625 -rgb555be 9b60d9aa1f3c78edf9936894f37e3243 -rgb555le 917fa8565f35882404a45fee3a947bf7 -rgb565be 12edaab49440fbb3aa4c1835fd697745 -rgb565le 5bf91cb1767066f23f0c672dedb4d476 -rgba 71687289b6c3ab6fa727d468de459026 +abgr e3160943d598d2a1117b1e9173dc4027 +argb c3762bd7e1fed82dd9e02672c9ee803c +bgr24 dc3e967b665a0dc870fa05663a05314a +bgr555be 1d0c78c6f8e2c1833bcd796db65826a5 +bgr555le d665835e34864e866e0846334687189a +bgr565be 94a64568072c568b4071fdef6f6756a1 +bgr565le 62012f12c290023a061ebd5db05f2a00 +bgra d046e079457444cb05f7c35aa7d45cc3 +rgb24 2326c437331b282b57bd2f5e411cac4a +rgb555be 6f0f2dd8bf531171c6103187a5a363db +rgb555le c38b47cde9feda43f6b3f7a479e32124 +rgb565be fbe6aab5f030d3bebbd9fc76719ba0aa +rgb565le fc819d8fc688dd2856eb55aa77a02910 +rgba 85428929279ccf095a712708b49d88d9 |