OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ad06be
)
prores: add missing feature warning for alpha
author
Janne Grunau
<janne-libav@jannau.net>
Fri, 14 Oct 2011 10:18:23 +0000
(12:18 +0200)
committer
Janne Grunau
<janne-libav@jannau.net>
Fri, 14 Oct 2011 19:07:53 +0000
(21:07 +0200)
libavcodec/proresdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/proresdec.c
b/libavcodec/proresdec.c
index
83c083f
..
2e0cbf1
100644
(file)
--- a/
libavcodec/proresdec.c
+++ b/
libavcodec/proresdec.c
@@
-71,6
+71,7
@@
typedef struct {
int slice_height_factor;
int num_x_mbs;
int num_y_mbs;
+ int alpha_info;
} ProresContext;
@@
-189,6
+190,10
@@
static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx->picture.top_field_first = ctx->frame_type & 1;
}
+ ctx->alpha_info = buf[17] & 0xf;
+ if (ctx->alpha_info)
+ av_log_missing_feature(avctx, "alpha channel", 0);
+
ctx->qmat_changed = 0;
ptr = buf + 20;
flags = buf[19];