--- decoder.c 2003/02/17 23:33:12 1.48 +++ decoder.c 2003/05/03 23:23:38 1.49.4.1 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: decoder.c,v 1.48 2003/02/17 23:33:12 edgomez Exp $ + * $Id: decoder.c,v 1.49.4.1 2003/05/03 23:23:38 Isibaar Exp $ * ****************************************************************************/ @@ -57,6 +57,7 @@ #include "image/image.h" #include "image/colorspace.h" #include "utils/mem_align.h" +#include "image/postprocessing.h" int decoder_resize(DECODER * dec) @@ -1723,9 +1724,9 @@ { /* note: image is stored to tmp */ image_copy(&dec->tmp, img, dec->edged_width, dec->height); - image_deblock_rrv(&dec->tmp, dec->edged_width, - mbs, dec->mb_width, dec->mb_height, dec->mb_width, - 8, frame->general); + image_deblock(&dec->tmp, dec->edged_width, + mbs, dec->mb_width, dec->mb_height, dec->mb_width, + frame->general); img = &dec->tmp; } @@ -1748,7 +1749,7 @@ uint32_t fcode_backward; uint32_t intra_dc_threshold; WARPPOINTS gmc_warp; - uint32_t vop_type; + int vop_type; int success = 0; int output = 0; int seen_something = 0; @@ -1807,7 +1808,7 @@ DPRINTF(DPRINTF_HEADER, "vop_type=%i, packed=%i, time=%lli, time_pp=%i, time_bp=%i", vop_type, dec->packed_mode, dec->time, dec->time_pp, dec->time_bp); - if (vop_type == - 1) + if (vop_type == -1) { if (success) goto done; emms();