diff options
| author | Ben Jackson <ben@ben.com> | 2012-09-15 21:32:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 22:26:35 +0400 |
| commit | eebc11ebc8000aefc8562d17749ac2f9160fdfec (patch) | |
| tree | e34abb45093093d688dd9e054ac6f72cd0602d54 /libavcodec/vp6.c | |
| parent | 6e86d6af6bd914fb076d1263cbb240c888a1284e (diff) | |
lavc/vp56: Move golden_frame into VP56Context
Makes golden_frame more like other frame data, paves way for threading
alpha channel decode.
Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index a895386085..c8a191799e 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -43,8 +43,7 @@ static void vp6_parse_coeff(VP56Context *s); static void vp6_parse_coeff_huffman(VP56Context *s); -static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, - int *golden_frame) +static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) { VP56RangeCoder *c = &s->c; int parse_filter_info = 0; @@ -100,6 +99,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, if (sub_version < 8) vrt_shift = 5; s->sub_version = sub_version; + s->golden_frame = 0; } else { if (!s->sub_version || !s->avctx->coded_width || !s->avctx->coded_height) return 0; @@ -111,7 +111,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, } ff_vp56_init_range_decoder(c, buf+1, buf_size-1); - *golden_frame = vp56_rac_get(c); + s->golden_frame = vp56_rac_get(c); if (s->filter_header) { s->deblock_filtering = vp56_rac_get(c); if (s->deblock_filtering) |