[SCM] libav/experimental: Fix compilation with -O0.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2b3649f656d68924bd9616d61bd252e7eb64bfec
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Jan 18 23:41:12 2010 +0000

    Fix compilation with -O0.
    
    Originally committed as revision 21308 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 63fe549..a469306 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -39,9 +39,6 @@
 #include "vdpau_internal.h"
 
 #include "cabac.h"
-#if ARCH_X86
-#include "x86/h264_i386.h"
-#endif
 
 //#undef NDEBUG
 #include <assert.h>
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 86ee926..e71ded1 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -35,10 +35,6 @@
 #include "h264_mvpred.h"
 #include "golomb.h"
 
-#if ARCH_X86
-#include "x86/h264_i386.h"
-#endif
-
 //#undef NDEBUG
 #include <assert.h>
 
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 6b656b1..24396bf 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -33,10 +33,6 @@
 #include "h264_mvpred.h"
 #include "rectangle.h"
 
-#if ARCH_X86
-#include "x86/h264_i386.h"
-#endif
-
 //#undef NDEBUG
 #include <assert.h>
 
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index fb52197..2ae3fd9 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -33,10 +33,6 @@
 #include "mathops.h"
 #include "rectangle.h"
 
-#if ARCH_X86
-#include "x86/h264_i386.h"
-#endif
-
 //#undef NDEBUG
 #include <assert.h>
 

-- 
Libav/FFmpeg packaging