[FFmpeg-cvslog] swscale: fix rgb48Toxyz12() endianness

Michael Niedermayer git at videolan.org
Fri Jan 10 17:43:25 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 10 17:23:04 2014 +0100| [ab9d7e0b120c9b940ddc490dab7805758580ba0e] | committer: Michael Niedermayer

swscale: fix rgb48Toxyz12() endianness

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab9d7e0b120c9b940ddc490dab7805758580ba0e
---

 libswscale/swscale.c                     |    2 +-
 tests/ref/fate/filter-pixdesc            |    2 +-
 tests/ref/fate/filter-pixfmts-copy       |    2 +-
 tests/ref/fate/filter-pixfmts-crop       |    2 +-
 tests/ref/fate/filter-pixfmts-field      |    2 +-
 tests/ref/fate/filter-pixfmts-fieldorder |    2 +-
 tests/ref/fate/filter-pixfmts-hflip      |    2 +-
 tests/ref/fate/filter-pixfmts-il         |    2 +-
 tests/ref/fate/filter-pixfmts-null       |    2 +-
 tests/ref/fate/filter-pixfmts-scale      |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 710dce3..1d623e7 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -854,7 +854,7 @@ static void rgb48Toxyz12(struct SwsContext *c, uint16_t *dst,
                          const uint16_t *src, int stride, int h)
 {
     int xp,yp;
-    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat);
 
     for (yp=0; yp<h; yp++) {
         for (xp=0; xp+2<stride; xp+=3) {
diff --git a/tests/ref/fate/filter-pixdesc b/tests/ref/fate/filter-pixdesc
index 56373fb..d44c34d 100644
--- a/tests/ref/fate/filter-pixdesc
+++ b/tests/ref/fate/filter-pixdesc
@@ -48,7 +48,7 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             71f608adceed8e8997aa463203b1a648
+xyz12be             6821e6d23d0df67ffad830fb8105d0da
 xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index edb246b..1433ed5 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -49,7 +49,7 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             b91ff224254afceb4a8f803d56eb52a1
+xyz12be             6821e6d23d0df67ffad830fb8105d0da
 xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 9651fb9..23df278 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -46,7 +46,7 @@ rgb8                87cf541b110e35a6f9a983e9cde85e15
 rgba                7abe1af7b97f5b9a7aa5ad3e4bf32f76
 rgba64be            2eed28b61af25790c02cc658e5f86b9b
 rgba64le            de8bc34c6d573488d87e87ce8c7ad07f
-xyz12be             7ea4ce13143195dfe1ed340bc9e86b2f
+xyz12be             cc917400e1174b5137083b27ec02bf94
 xyz12le             e4e86ef100e07cda561a22811f242e5d
 yuv410p             126e0da1da4fd89be28087b8367bbb36
 yuv411p             b94f0af107fc4796aca70c0a36d374c5
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index d4822b1..b21d6bd 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -49,7 +49,7 @@ rgba                d0ebdf1495bc6b7e9d3bfbe2813a9d16
 rgba64be            53363baf266592e0ac02b3f8242ec4fb
 rgba64le            a630eaa38545b2be741f000ab58451e5
 uyvy422             a6a52504a16f09b8f2ec2405bc8190b5
-xyz12be             33d0b7ef124a9e94d2d13a2cad1dfc00
+xyz12be             6eb0891658dfd71adf41432a947e210c
 xyz12le             bab6403abf58e69575900802ffef8f38
 yuv410p             3feb55b1e2a385b488c82e808a12587b
 yuv411p             ab3dd8e6cf1452afe2d2e976e4726370
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index d743caa..916a85e 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -44,7 +44,7 @@ rgba                af33be882959a2fc963d6e5984d24b6d
 rgba64be            9ae73ceaa9d95e7981b4df559b0d3b6d
 rgba64le            86997e62f62d2a5351b5ca9c9c93c2d1
 uyvy422             a07829fe630b59855c80d87d0e8f0dbb
-xyz12be             5785613045b051cee508625dde3357df
+xyz12be             1f0873abd159a9c94200670b7e7bc661
 xyz12le             3645601dc8bfbdff68cc823a0fc85b27
 yuv411p             3d3d427999863945aa5ec03edf98c19a
 yuv422p             961d8a22bfe8868eb3c743b4241a3c99
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index d672346..15d864e 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -46,7 +46,7 @@ rgb8                22fdbd14ce296c1afa9bb4a6ea09b3fe
 rgba                a37789c4df73c3bd8648ad1fe9d3f991
 rgba64be            286067334e4bca33fba7ebb1706890a2
 rgba64le            2a8b3dd5045df299259636d8e6b62589
-xyz12be             079dac329f0d93df7a7e71b260f13dd9
+xyz12be             84ecf49fea8e0eae954e7c511bd17b75
 xyz12le             31c4f953548326b27920c5939bcf2cce
 yuv410p             a1280c2b9b562dba3c2d35a1e5fc4b23
 yuv411p             6bf10756ac5c7841db63a97106ff911b
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index d9a7a86..bed3d7f 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -48,7 +48,7 @@ rgba                8ca9c8db589615ebbaa964be4ce62d08
 rgba64be            576dfc2fd1937f9e594c4004fafd83f2
 rgba64le            7938eccc1f05f13710ec351767b47a36
 uyvy422             8be40aded4b407ff66305911ba5ce2ce
-xyz12be             ba8a8152ca6e8b338e1dc5ace0a729b6
+xyz12be             210d55ba1296a33846169489fbd2b1ae
 xyz12le             1f20849dcf44539ce351346c73bdff1a
 yuv410p             92112d85ba4f74cbd3044945c0f33402
 yuv411p             b6b22000e5275c92baf5afc417c32a70
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index edb246b..1433ed5 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -49,7 +49,7 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
 rgba64le            1b826cc613666f545274e8a7799d69f1
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
-xyz12be             b91ff224254afceb4a8f803d56eb52a1
+xyz12be             6821e6d23d0df67ffad830fb8105d0da
 xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index d2c8574..51575ab 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -49,7 +49,7 @@ rgba                aec2346373d91abdc8c0301b44513128
 rgba64be            5ce6f591ac8be4edcf5c3350d2d2d3f5
 rgba64le            12baab5162019de2053db39a3bfca868
 uyvy422             479105bc4c7fbb4a33ca8745aa8c2de8
-xyz12be             6769a0b3b3b6d7a674542c8cd3e3644e
+xyz12be             7ad7fd42ad8c1f823fa5f0aba16d2247
 xyz12le             b4f967df71db5c38c222f9236c341031
 yuv410p             d0daa93f5cee83360e219e39563ab6da
 yuv411p             e5c8f3ca024a88dd07e0a92db3e2133d



More information about the ffmpeg-cvslog mailing list