[FFmpeg-cvslog] dds: Drop gray-alpha swapping

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Fri Apr 22 17:28:03 2016 -0400| [6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3] | committer: Vittorio Giovara

dds: Drop gray-alpha swapping

The original sample was generated with invalid software.

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

 libavcodec/dds.c      |   12 ------------
 tests/ref/fate/dds-ya |    2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index fcfc84e..f549cad 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -45,7 +45,6 @@ enum DDSPostProc {
     DDS_ALPHA_EXP,
     DDS_NORMAL_MAP,
     DDS_RAW_YCOCG,
-    DDS_SWAP_ALPHA,
     DDS_SWIZZLE_A2XY,
     DDS_SWIZZLE_RBXG,
     DDS_SWIZZLE_RGXB,
@@ -392,8 +391,6 @@ static int parse_pixel_format(AVCodecContext *avctx)
         ctx->postproc = DDS_NORMAL_MAP;
     else if (ycocg_classic && !ctx->compressed)
         ctx->postproc = DDS_RAW_YCOCG;
-    else if (avctx->pix_fmt == AV_PIX_FMT_YA8)
-        ctx->postproc = DDS_SWAP_ALPHA;
 
     /* ATI/NVidia variants sometimes add swizzling in bpp. */
     switch (bpp) {
@@ -540,15 +537,6 @@ static void run_postproc(AVCodecContext *avctx, AVFrame *frame)
             src[3] = a;
         }
         break;
-    case DDS_SWAP_ALPHA:
-        /* Alpha and Luma are stored swapped. */
-        av_log(avctx, AV_LOG_DEBUG, "Post-processing swapped Luma/Alpha.\n");
-
-        for (i = 0; i < frame->linesize[0] * frame->height; i += 2) {
-            uint8_t *src = frame->data[0] + i;
-            FFSWAP(uint8_t, src[0], src[1]);
-        }
-        break;
     case DDS_SWIZZLE_A2XY:
         /* Swap R and G, often used to restore a standard RGTC2. */
         av_log(avctx, AV_LOG_DEBUG, "Post-processing A2XY swizzle.\n");
diff --git a/tests/ref/fate/dds-ya b/tests/ref/fate/dds-ya
index d6527c6..01f7894 100644
--- a/tests/ref/fate/dds-ya
+++ b/tests/ref/fate/dds-ya
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,    28160, 0xd3981fcb
+0,          0,          0,        1,    28160, 0x5aa41fcb