Browse code

Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'

* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
dds: Add support for monochrome images

Merged-by: Clément Bœsch <clement@stupeflix.com>

Clément Bœsch authored on 2016/06/21 19:20:38
Showing 3 changed files
... ...
@@ -242,6 +242,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
242 242
             ctx->paletted   = 1;
243 243
             avctx->pix_fmt  = AV_PIX_FMT_PAL8;
244 244
             break;
245
+        case MKTAG('G', '1', ' ', ' '):
246
+            ctx->compressed = 0;
247
+            avctx->pix_fmt  = AV_PIX_FMT_MONOBLACK;
248
+            break;
245 249
         case MKTAG('D', 'X', '1', '0'):
246 250
             /* DirectX 10 extra header */
247 251
             dxgi = bytestream2_get_le32(gbc);
... ...
@@ -65,6 +65,7 @@ DDS_FMT          = alpha8                                               \
65 65
                    dxt5-xrbg                                            \
66 66
                    dxt5-ycocg                                           \
67 67
                    dxt5-ycocg-scaled                                    \
68
+                   monob                                                \
68 69
                    pal                                                  \
69 70
                    pal-ati                                              \
70 71
                    rgb1555                                              \
71 72
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+#tb 0: 1/25
1
+#media_type 0: video
2
+#codec_id 0: rawvideo
3
+#dimensions 0: 122x122
4
+#sar 0: 0/1
5
+0,          0,          0,        1,     1952, 0x716498a1