diff options
| author | Jérôme Martinez <jerome@mediaarea.net> | 2018-02-14 08:39:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-15 04:35:23 +0100 |
| commit | fb580731c1febec44e0f1ec1433f6b3ee89cfe65 (patch) | |
| tree | dd3e351b738f2ec5dc0f46bd71560ddaa6f9557c /libavcodec/ffv1dec_template.c | |
| parent | aa6280805e21e1e2c3fb7bb1efb47a27ceeb3fed (diff) | |
| download | ffmpeg-fb580731c1febec44e0f1ec1433f6b3ee89cfe65.tar.gz | |
avcodec/ffv1: Support for GBRAP10 and GBRAP12
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ffv1dec_template.c')
| -rw-r--r-- | libavcodec/ffv1dec_template.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index a25b3384f1..f8a42a6d44 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -155,7 +155,7 @@ static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int if (lbd) *((uint32_t*)(src[0] + x*4 + stride[0]*y)) = b + ((unsigned)g<<8) + ((unsigned)r<<16) + ((unsigned)a<<24); - else if (sizeof(TYPE) == 4) { + else if (sizeof(TYPE) == 4 || transparency) { *((uint16_t*)(src[0] + x*2 + stride[0]*y)) = g; *((uint16_t*)(src[1] + x*2 + stride[1]*y)) = b; *((uint16_t*)(src[2] + x*2 + stride[2]*y)) = r; @@ -165,8 +165,6 @@ static void RENAME(decode_rgb_frame)(FFV1Context *s, uint8_t *src[4], int w, int *((uint16_t*)(src[0] + x*2 + stride[0]*y)) = b; *((uint16_t*)(src[1] + x*2 + stride[1]*y)) = g; *((uint16_t*)(src[2] + x*2 + stride[2]*y)) = r; - if (transparency) - *((uint16_t*)(src[3] + x*2 + stride[3]*y)) = a; } } } |