diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2007-09-25 23:12:46 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-09-25 23:12:46 +0400 |
commit | 91fc2cf150cdee0493e51dfe44df0ab88ff2f31b (patch) | |
tree | 8beec3900d9005aa6fc13d527d054b761ca9dbc9 /libavcodec/vp6.c | |
parent | 58f66029b6bb8f14ae0dcadf0cd73d92f38ccb38 (diff) |
add a new vp6a codec (add alpha plan support to vp6)
Originally committed as revision 10574 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp6.c')
-rw-r--r-- | libavcodec/vp6.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 5c4b935ae5..ffd95f0cad 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -494,7 +494,8 @@ static int vp6_decode_init(AVCodecContext *avctx) { vp56_context_t *s = avctx->priv_data; - vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6); + vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, + avctx->codec->id == CODEC_ID_VP6A); s->vp56_coord_div = vp6_coord_div; s->parse_vector_adjustment = vp6_parse_vector_adjustment; s->adjust = vp6_adjust; @@ -532,3 +533,16 @@ AVCodec vp6f_decoder = { vp56_decode_frame, CODEC_CAP_DR1, }; + +/* flash version, not flipped upside-down, with alpha channel */ +AVCodec vp6a_decoder = { + "vp6a", + CODEC_TYPE_VIDEO, + CODEC_ID_VP6A, + sizeof(vp56_context_t), + vp6_decode_init, + NULL, + vp56_free, + vp56_decode_frame, + CODEC_CAP_DR1, +}; |