diff options
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 47eaa0b..28327d7 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -2,20 +2,20 @@ * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -405,7 +405,8 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, || full_my < 0-extra_height || full_mx + 16/*FIXME*/ > pic_width + extra_width || full_my + 16/*FIXME*/ > pic_height + extra_height){ - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_y - 2 - 2*h->l_stride, h->l_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->l_stride, + src_y - 2 - 2*h->l_stride, h->l_stride, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height); src_y= h->edge_emu_buffer + 2 + 2*h->l_stride; emu=1; @@ -414,14 +415,14 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, qpix_op[luma_xy](dest_y, src_y, h->l_stride); //FIXME try variable height perhaps? if(emu){ - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cb, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cb= h->edge_emu_buffer; } chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx&7, my&7); if(emu){ - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr, h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cr, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cr= h->edge_emu_buffer; } @@ -673,7 +674,7 @@ int ff_cavs_next_mb(AVSContext *h) { * ****************************************************************************/ -void ff_cavs_init_pic(AVSContext *h) { +int ff_cavs_init_pic(AVSContext *h) { int i; /* clear some predictors */ @@ -693,6 +694,8 @@ void ff_cavs_init_pic(AVSContext *h) { h->luma_scan[3] = 8*h->l_stride+8; h->mbx = h->mby = h->mbidx = 0; h->flags = 0; + + return 0; } /***************************************************************************** |
