changeset 773:2996c71961a0

fix the merge conflicts
author Deepthi Devaki
date Tue, 23 Apr 2013 11:06:42 +0530
parents afcb19e80d04
children eb50336c8520
files source/encoder/vec/macroblock.inc
diffstat 1 files changed, 1 insertions(+-), 1 deletions(-) [+]
line wrap: on
line diff
--- a/source/encoder/vec/macroblock.inc	Fri Apr 19 17:14:25 2013 +0530
+++ b/source/encoder/vec/macroblock.inc	Tue Apr 23 11:06:42 2013 +0530
@@ -248,7 +248,7 @@ void CDECL filter_Vertical_16bit(const s
 }
 
 template<int N, bool isFirst, bool isLast>
-void CDECL filter_Vertical(const short *coeff, pixel *src, int srcstride, pixel *dst, int dststride, int block_width,
+void CDECL filter_Vertical(const short *coeff, short *src, int srcstride, short *dst, int dststride, int block_width,
                            int block_height, int bitdepth)
 {
     int row, col;