diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 21:56:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 22:24:00 +0200 |
| commit | bd4ebbbbed47761df65dd574dce6d3c56d29e2e7 (patch) | |
| tree | 415ffb3c9ed9507a7c6ae115e1c201a85271e4ed /libavcodec/proresdec_lgpl.c | |
| parent | 4b9e9a57eeadf1ece872b19a433b3c004aaa5e46 (diff) | |
| parent | 05c8f119cc6b5727319c56b055af82ac1ded93b5 (diff) | |
| download | ffmpeg-bd4ebbbbed47761df65dd574dce6d3c56d29e2e7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: fix function prototypes.
prores-idct: fix overflow in c code.
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
prores: add missing feature warning for alpha
mov: 10l: Terminate string with 0 not '0'
mov: Prevent illegal writes when chapter titles are very short.
prores: add appropriate -fix_fmt parameter to FATE command
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec_lgpl.c')
| -rw-r--r-- | libavcodec/proresdec_lgpl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index d0f00a7293..f67db6cc92 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.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]; |