mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
parent
f07923253a
commit
139cbeb75e
@ -356,6 +356,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
|
||||
/* 16 bpp */
|
||||
else if (bpp == 16 && r == 0xff && g == 0 && b == 0 && a == 0xff00)
|
||||
avctx->pix_fmt = AV_PIX_FMT_YA8;
|
||||
else if (bpp == 16 && r == 0xff00 && g == 0 && b == 0 && a == 0xff) {
|
||||
avctx->pix_fmt = AV_PIX_FMT_YA8;
|
||||
ctx->postproc = DDS_SWAP_ALPHA;
|
||||
}
|
||||
else if (bpp == 16 && r == 0xffff && g == 0 && b == 0 && a == 0)
|
||||
avctx->pix_fmt = AV_PIX_FMT_GRAY16LE;
|
||||
else if (bpp == 16 && r == 0xf800 && g == 0x7e0 && b == 0x1f && a == 0)
|
||||
@ -387,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) {
|
||||
|
@ -29,7 +29,7 @@
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 57
|
||||
#define LIBAVCODEC_VERSION_MINOR 34
|
||||
#define LIBAVCODEC_VERSION_MICRO 101
|
||||
#define LIBAVCODEC_VERSION_MICRO 102
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
LIBAVCODEC_VERSION_MINOR, \
|
||||
|
@ -3,4 +3,4 @@
|
||||
#codec_id 0: rawvideo
|
||||
#dimensions 0: 220x64
|
||||
#sar 0: 0/1
|
||||
0, 0, 0, 1, 28160, 0xd3981fcb
|
||||
0, 0, 0, 1, 28160, 0x5aa41fcb
|
||||
|
Loading…
Reference in New Issue
Block a user