ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/mathops.h

 /*
  * simple math operations
  * Copyright (c) 2001, 2002 Fabrice Bellard
  * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> et al
  *
  * This file is part of FFmpeg.
  *
  * 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
@@ skipping 104 matching lines @@
 }
 #endif
 
 #ifndef sign_extend
 static inline av_const int sign_extend(int val, unsigned bits)
 {
     return (val << (INT_BIT - bits)) >> (INT_BIT - bits);
 }
 #endif
 
+#ifndef zero_extend
+static inline av_const unsigned zero_extend(unsigned val, unsigned bits)
+{
+    return (val << (INT_BIT - bits)) >> (INT_BIT - bits);
+}
+#endif
+
 #ifndef COPY3_IF_LT
 #define COPY3_IF_LT(x, y, a, b, c, d)\
 if ((y) < (x)) {\
     (x) = (y);\
     (a) = (b);\
     (c) = (d);\
 }
 #endif
 
+#ifndef NEG_SSR32
+#   define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
+#endif
+
+#ifndef NEG_USR32
+#   define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
+#endif
+
 #endif /* AVCODEC_MATHOPS_H */