patches should be split into incremental changes if possible

[ffmpeg] / libswscale / yuv2rgb_template.c

diff --git a/libswscale/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c
index 2f15931ead44d9c394b385b9249c4e38ae6f2d66..28ee24add2909265a1790f72e7c6cc675c652b74 100644 (file)
--- a/libswscale/yuv2rgb_template.c
+++ b/libswscale/yuv2rgb_template.c
@@ -20,8 +20,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with mpeg2dec; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * 15,24 bpp and dithering from Michael Niedermayer (michaelni@gmx.at)
  * MMX/MMX2 Template stuff from Michael Niedermayer (needed for fast movntq support)
@@ -127,13 +127,13 @@ static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* src[], int srcStr
              int srcSliceH, uint8_t* dst[], int dstStride[]){
     int y, h_size;
 
-    if(c->srcFormat == IMGFMT_422P){
+    if(c->srcFormat == PIX_FMT_YUV422P){
        srcStride[1] *= 2;
        srcStride[2] *= 2;
     }
 
     h_size= (c->dstW+7)&~7;
-    if(h_size*2 > dstStride[0]) h_size-=8;
+    if(h_size*2 > FFABS(dstStride[0])) h_size-=8;
     
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
 //printf("%X %X %X %X %X %X %X %X %X %X\n", (int)&c->redDither, (int)&b5Dither, (int)src[0], (int)src[1], (int)src[2], (int)dst[0],
@@ -222,13 +222,13 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr
              int srcSliceH, uint8_t* dst[], int dstStride[]){
     int y, h_size;
 
-    if(c->srcFormat == IMGFMT_422P){
+    if(c->srcFormat == PIX_FMT_YUV422P){
        srcStride[1] *= 2;
        srcStride[2] *= 2;
     }
 
     h_size= (c->dstW+7)&~7;
-    if(h_size*2 > dstStride[0]) h_size-=8;
+    if(h_size*2 > FFABS(dstStride[0])) h_size-=8;
     
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
 //printf("%X %X %X %X %X %X %X %X %X %X\n", (int)&c->redDither, (int)&b5Dither, (int)src[0], (int)src[1], (int)src[2], (int)dst[0],
@@ -311,13 +311,13 @@ static inline int RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* src[], int srcStr
              int srcSliceH, uint8_t* dst[], int dstStride[]){
     int y, h_size;
 
-    if(c->srcFormat == IMGFMT_422P){
+    if(c->srcFormat == PIX_FMT_YUV422P){
        srcStride[1] *= 2;
        srcStride[2] *= 2;
     }
 
     h_size= (c->dstW+7)&~7;
-    if(h_size*3 > dstStride[0]) h_size-=8;
+    if(h_size*3 > FFABS(dstStride[0])) h_size-=8;
     
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
 
@@ -457,13 +457,13 @@ static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* src[], int srcStr
              int srcSliceH, uint8_t* dst[], int dstStride[]){
     int y, h_size;
 
-    if(c->srcFormat == IMGFMT_422P){
+    if(c->srcFormat == PIX_FMT_YUV422P){
        srcStride[1] *= 2;
        srcStride[2] *= 2;
     }
 
     h_size= (c->dstW+7)&~7;
-    if(h_size*4 > dstStride[0]) h_size-=8;
+    if(h_size*4 > FFABS(dstStride[0])) h_size-=8;
     
     __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );