diff -ru mythtv-0.14/libs/libavcodec/common.h mythtv-0.14-fixed/libs/libavcodec/common.h
--- mythtv-0.14/libs/libavcodec/common.h	2004-01-18 18:39:22.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/common.h	2004-02-06 15:40:12.000000000 +0000
@@ -78,10 +78,12 @@
 #    define restrict
 #endif
 
+#ifndef __inline
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-#    define always_inline __attribute__((always_inline)) inline
+#    define __inline __attribute__((always_inline)) inline
 #else
-#    define always_inline inline
+#    define __inline inline
+#endif
 #endif
 
 #ifndef EMULATE_INTTYPES
@@ -887,7 +889,7 @@
  *                  read the longest vlc code 
  *                  = (max_vlc_length + bits - 1) / bits
  */
-static always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
+static __inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
                                   int bits, int max_depth)
 {
     int code;
diff -ru mythtv-0.14/libs/libavcodec/dv.c mythtv-0.14-fixed/libs/libavcodec/dv.c
--- mythtv-0.14/libs/libavcodec/dv.c	2004-01-06 07:21:35.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/dv.c	2004-02-06 15:42:28.000000000 +0000
@@ -571,7 +571,7 @@
 
 #ifdef DV_CODEC_TINY_TARGET
 /* Converts run and level (where level != 0) pair into vlc, returning bit size */
-static always_inline int dv_rl2vlc(int run, int l, uint32_t* vlc)
+static __inline int dv_rl2vlc(int run, int l, uint32_t* vlc)
 {
     int sign = l >> 8;
     int level = (l ^ sign) - sign;
@@ -601,7 +601,7 @@
     return size;
 }
 
-static always_inline int dv_rl2vlc_size(int run, int l)
+static __inline int dv_rl2vlc_size(int run, int l)
 {
     int level = (l ^ (l >> 8)) - (l >> 8);
     int size;
@@ -618,13 +618,13 @@
     return size;
 }
 #else
-static always_inline int dv_rl2vlc(int run, int l, uint32_t* vlc)
+static __inline int dv_rl2vlc(int run, int l, uint32_t* vlc)
 {
     *vlc = dv_vlc_map[run][((uint16_t)l)&0x1ff].vlc;
     return dv_vlc_map[run][((uint16_t)l)&0x1ff].size;
 }
 
-static always_inline int dv_rl2vlc_size(int run, int l)
+static __inline int dv_rl2vlc_size(int run, int l)
 {
     return dv_vlc_map[run][((uint16_t)l)&0x1ff].size;
 }
@@ -642,13 +642,13 @@
     uint32_t partial_bit_buffer; /* we can't use uint16_t here */
 } EncBlockInfo;
 
-static always_inline int dv_bits_left(PutBitContext* s)
+static __inline int dv_bits_left(PutBitContext* s)
 {
     return (s->buf_end - s->buf) * 8 - 
            ((s->buf_ptr - s->buf) * 8 + 32 - (int64_t)s->bit_left);
 }
 
-static always_inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool, 
+static __inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool, 
                                        int pb_size)
 {
     int run;
@@ -694,7 +694,7 @@
        }
 }
 
-static always_inline void dv_set_class_number(DCTELEM* blk, EncBlockInfo* bi, 
+static __inline void dv_set_class_number(DCTELEM* blk, EncBlockInfo* bi, 
                                               const uint8_t* zigzag_scan, int bias)
 {
     int i, area;
@@ -730,7 +730,7 @@
 }
 
 #define SC(x, y) ((s[x] - s[y]) ^ ((s[x] - s[y]) >> 7))
-static always_inline int dv_guess_dct_mode(DCTELEM *blk) {
+static __inline int dv_guess_dct_mode(DCTELEM *blk) {
     DCTELEM *s;
     int score88 = 0;
     int score248 = 0;
diff -ru mythtv-0.14/libs/libavcodec/faandct.c mythtv-0.14-fixed/libs/libavcodec/faandct.c
--- mythtv-0.14/libs/libavcodec/faandct.c	2003-11-12 06:13:33.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/faandct.c	2004-02-06 15:42:32.000000000 +0000
@@ -70,7 +70,7 @@
 B7*B0, B7*B1, B7*B2, B7*B3, B7*B4, B7*B5, B7*B6, B7*B7,
 };
 
-static always_inline void row_fdct(FLOAT temp[64], DCTELEM * data)
+static __inline void row_fdct(FLOAT temp[64], DCTELEM * data)
 {
     FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
     FLOAT tmp10, tmp11, tmp12, tmp13;
diff -ru mythtv-0.14/libs/libavcodec/ffv1.c mythtv-0.14-fixed/libs/libavcodec/ffv1.c
--- mythtv-0.14/libs/libavcodec/ffv1.c	2003-11-12 06:13:33.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/ffv1.c	2004-02-06 15:42:36.000000000 +0000
@@ -183,7 +183,7 @@
     DSPContext dsp; 
 }FFV1Context;
 
-static always_inline int fold(int diff, int bits){
+static __inline int fold(int diff, int bits){
     if(bits==8)
         diff= (int8_t)diff;
     else{
diff -ru mythtv-0.14/libs/libavcodec/i386/fdct_mmx.c mythtv-0.14-fixed/libs/libavcodec/i386/fdct_mmx.c
--- mythtv-0.14/libs/libavcodec/i386/fdct_mmx.c	2004-01-18 18:39:24.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/i386/fdct_mmx.c	2004-02-06 17:30:36.000000000 +0000
@@ -124,7 +124,7 @@
 };
 
 
-static always_inline void fdct_col(const int16_t *in, int16_t *out, int offset)
+static __inline void fdct_col(const int16_t *in, int16_t *out, int offset)
 {
     movq_m2r(*(in + offset + 1 * 8), mm0);
     movq_m2r(*(in + offset + 6 * 8), mm1);
@@ -203,7 +203,7 @@
     movq_r2m(mm3, *(out + offset + 7 * 8));
 }
 
-static always_inline void fdct_row_mmx2(const int16_t *in, int16_t *out, const int16_t *table)
+static __inline void fdct_row_mmx2(const int16_t *in, int16_t *out, const int16_t *table)
 { 
     pshufw_m2r(*(in + 4), mm5, 0x1B);
     movq_m2r(*(in + 0), mm0);
@@ -246,7 +246,7 @@
     movq_r2m(mm2, *(out + 4));
 }
 
-static always_inline void fdct_row_mmx(const int16_t *in, int16_t *out, const int16_t *table)
+static __inline void fdct_row_mmx(const int16_t *in, int16_t *out, const int16_t *table)
 { 
     movd_m2r(*(in + 6), mm1);
     punpcklwd_m2r(*(in + 4), mm1);
diff -ru mythtv-0.14/libs/libavcodec/jfdctfst.c mythtv-0.14-fixed/libs/libavcodec/jfdctfst.c
--- mythtv-0.14/libs/libavcodec/jfdctfst.c	2003-11-12 06:13:35.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/jfdctfst.c	2004-02-06 15:42:42.000000000 +0000
@@ -112,7 +112,7 @@
 
 #define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
 
-static always_inline void row_fdct(DCTELEM * data){
+static __inline void row_fdct(DCTELEM * data){
   int_fast16_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
   int_fast16_t tmp10, tmp11, tmp12, tmp13;
   int_fast16_t z1, z2, z3, z4, z5, z11, z13;
diff -ru mythtv-0.14/libs/libavcodec/jfdctint.c mythtv-0.14-fixed/libs/libavcodec/jfdctint.c
--- mythtv-0.14/libs/libavcodec/jfdctint.c	2003-11-12 06:13:35.000000000 +0000
+++ mythtv-0.14-fixed/libs/libavcodec/jfdctint.c	2004-02-06 15:42:49.000000000 +0000
@@ -148,7 +148,7 @@
 #endif
 
 
-static always_inline void row_fdct(DCTELEM * data){
+static __inline void row_fdct(DCTELEM * data){
   int_fast32_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
   int_fast32_t tmp10, tmp11, tmp12, tmp13;
   int_fast32_t z1, z2, z3, z4, z5;