[SCM] libav/experimental: when changing version, please keep my changes (win32 compile fix)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:37:08 UTC 2013


The following commit has been merged in the experimental branch:
commit 3519af27d83963132197edaf6a492285651d3299
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Sun Aug 24 13:57:42 2003 +0000

    when changing version, please keep my changes (win32 compile fix)
    
    Originally committed as revision 2138 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/liba52/bit_allocate.c b/libavcodec/liba52/bit_allocate.c
index c8da24e..7b595a0 100644
--- a/libavcodec/liba52/bit_allocate.c
+++ b/libavcodec/liba52/bit_allocate.c
@@ -20,11 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "config.h"
-
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 
diff --git a/libavcodec/liba52/bitstream.c b/libavcodec/liba52/bitstream.c
index ba847d9..89b69cf 100644
--- a/libavcodec/liba52/bitstream.c
+++ b/libavcodec/liba52/bitstream.c
@@ -20,11 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "config.h"
-
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "bitstream.h"
diff --git a/libavcodec/liba52/downmix.c b/libavcodec/liba52/downmix.c
index 5660951..a4ce747 100644
--- a/libavcodec/liba52/downmix.c
+++ b/libavcodec/liba52/downmix.c
@@ -20,12 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "config.h"
-
-#include <string.h>
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 
diff --git a/libavcodec/liba52/imdct.c b/libavcodec/liba52/imdct.c
index efac6e2..7a1690b 100644
--- a/libavcodec/liba52/imdct.c
+++ b/libavcodec/liba52/imdct.c
@@ -24,18 +24,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
-#include <math.h>
-#include <stdio.h>
-#ifdef LIBA52_DJBFFT
-#include <fftc4.h>
-#endif
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795029
-#endif
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "mm_accel.h"
diff --git a/libavcodec/liba52/parse.c b/libavcodec/liba52/parse.c
index 505a335..d3e6914 100644
--- a/libavcodec/liba52/parse.c
+++ b/libavcodec/liba52/parse.c
@@ -20,13 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "bitstream.h"
diff --git a/libavcodec/liba52/resample.c b/libavcodec/liba52/resample.c
index 284cbbe..bb7de91 100644
--- a/libavcodec/liba52/resample.c
+++ b/libavcodec/liba52/resample.c
@@ -4,8 +4,6 @@
 
 // a52_resample() should do the conversion.
 
-#include <inttypes.h>
-#include <stdio.h>
 #include "a52.h"
 #include "mm_accel.h"
 #include "config.h"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list