|
|
|
@ -1853,8 +1853,8 @@ static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
|
AVPacket *avpkt) |
|
|
|
|
int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
|
AVPacket *avpkt) |
|
|
|
|
{ |
|
|
|
|
VP8Context *s = avctx->priv_data; |
|
|
|
|
int ret, i, referenced, num_jobs; |
|
|
|
@ -2010,7 +2010,7 @@ err: |
|
|
|
|
return ret; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static av_cold int vp8_decode_free(AVCodecContext *avctx) |
|
|
|
|
av_cold int ff_vp8_decode_free(AVCodecContext *avctx) |
|
|
|
|
{ |
|
|
|
|
VP8Context *s = avctx->priv_data; |
|
|
|
|
int i; |
|
|
|
@ -2033,7 +2033,7 @@ static av_cold int vp8_init_frames(VP8Context *s) |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static av_cold int vp8_decode_init(AVCodecContext *avctx) |
|
|
|
|
av_cold int ff_vp8_decode_init(AVCodecContext *avctx) |
|
|
|
|
{ |
|
|
|
|
VP8Context *s = avctx->priv_data; |
|
|
|
|
int ret; |
|
|
|
@ -2047,7 +2047,7 @@ static av_cold int vp8_decode_init(AVCodecContext *avctx) |
|
|
|
|
ff_vp8dsp_init(&s->vp8dsp); |
|
|
|
|
|
|
|
|
|
if ((ret = vp8_init_frames(s)) < 0) { |
|
|
|
|
vp8_decode_free(avctx); |
|
|
|
|
ff_vp8_decode_free(avctx); |
|
|
|
|
return ret; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2062,7 +2062,7 @@ static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx) |
|
|
|
|
s->avctx = avctx; |
|
|
|
|
|
|
|
|
|
if ((ret = vp8_init_frames(s)) < 0) { |
|
|
|
|
vp8_decode_free(avctx); |
|
|
|
|
ff_vp8_decode_free(avctx); |
|
|
|
|
return ret; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2110,9 +2110,9 @@ AVCodec ff_vp8_decoder = { |
|
|
|
|
.type = AVMEDIA_TYPE_VIDEO, |
|
|
|
|
.id = AV_CODEC_ID_VP8, |
|
|
|
|
.priv_data_size = sizeof(VP8Context), |
|
|
|
|
.init = vp8_decode_init, |
|
|
|
|
.close = vp8_decode_free, |
|
|
|
|
.decode = vp8_decode_frame, |
|
|
|
|
.init = ff_vp8_decode_init, |
|
|
|
|
.close = ff_vp8_decode_free, |
|
|
|
|
.decode = ff_vp8_decode_frame, |
|
|
|
|
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS, |
|
|
|
|
.flush = vp8_decode_flush, |
|
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), |
|
|
|
|