diff options
Diffstat (limited to 'lib/ffmpeg/libavcodec/vc1dec.c')
| -rw-r--r-- | lib/ffmpeg/libavcodec/vc1dec.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/lib/ffmpeg/libavcodec/vc1dec.c b/lib/ffmpeg/libavcodec/vc1dec.c index 8c9cbcd9db..3bd2cce297 100644 --- a/lib/ffmpeg/libavcodec/vc1dec.c +++ b/lib/ffmpeg/libavcodec/vc1dec.c @@ -288,12 +288,12 @@ static void vc1_mc_1mv(VC1Context *v, int dir) uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; srcY -= s->mspel * (1 + s->linesize); - ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); srcY = s->edge_emu_buffer; - ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); - ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); srcU = uvbuf; srcV = uvbuf + 16; @@ -403,7 +403,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n) || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 8 - s->mspel*2 || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 8 - s->mspel*2){ srcY -= s->mspel * (1 + s->linesize); - ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2, src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); srcY = s->edge_emu_buffer; /* if we deal with range reduction we need to scale source blocks */ @@ -537,9 +537,9 @@ static void vc1_mc_4mv_chroma(VC1Context *v) if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP) || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){ - ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); - ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); srcU = s->edge_emu_buffer; srcV = s->edge_emu_buffer + 16; @@ -872,12 +872,12 @@ static void vc1_interp_mc(VC1Context *v) uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize; srcY -= s->mspel * (1 + s->linesize); - ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2, src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos); srcY = s->edge_emu_buffer; - ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); - ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, + s->dsp.emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1, uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1); srcU = uvbuf; srcV = uvbuf + 16; @@ -3240,6 +3240,11 @@ static int vc1_decode_frame(AVCodecContext *avctx, } } + if(v->res_sprite && (s->pict_type!=FF_I_TYPE)){ + av_free(buf2); + return -1; + } + // for hurry_up==5 s->current_picture.pict_type= s->pict_type; s->current_picture.key_frame= s->pict_type == FF_I_TYPE; @@ -3340,7 +3345,7 @@ static av_cold int vc1_decode_end(AVCodecContext *avctx) } -AVCodec vc1_decoder = { +AVCodec ff_vc1_decoder = { "vc1", AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1, @@ -3356,7 +3361,7 @@ AVCodec vc1_decoder = { }; #if CONFIG_WMV3_DECODER -AVCodec wmv3_decoder = { +AVCodec ff_wmv3_decoder = { "wmv3", AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV3, @@ -3373,7 +3378,7 @@ AVCodec wmv3_decoder = { #endif #if CONFIG_WMV3_VDPAU_DECODER -AVCodec wmv3_vdpau_decoder = { +AVCodec ff_wmv3_vdpau_decoder = { "wmv3_vdpau", AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV3, @@ -3390,7 +3395,7 @@ AVCodec wmv3_vdpau_decoder = { #endif #if CONFIG_VC1_VDPAU_DECODER -AVCodec vc1_vdpau_decoder = { +AVCodec ff_vc1_vdpau_decoder = { "vc1_vdpau", AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1, |