Wed Nov 29 16:02:46 CET 2006

Author: diego
Date: Wed Nov 29 16:02:45 2006
New Revision: 21388

Removed:
   trunk/bswap.h
Modified:
   trunk/libaf/af_format.c
   trunk/libao2/ao_dxr2.c
   trunk/libao2/ao_pcm.c
   trunk/libdha/sysdep/pci_linux.c
   trunk/libmpcodecs/ad_dk3adpcm.c
   trunk/libmpcodecs/ad_ffmpeg.c
   trunk/libmpcodecs/ad_imaadpcm.c
   trunk/libmpcodecs/ad_liba52.c
   trunk/libmpcodecs/ad_msadpcm.c
   trunk/libmpcodecs/native/RTjpegN.c
   trunk/libmpcodecs/native/nuppelvideo.c
   trunk/libmpcodecs/vd_ffmpeg.c
   trunk/libmpcodecs/vd_ijpg.c
   trunk/libmpcodecs/vd_mpng.c
   trunk/libmpcodecs/vd_mtga.c
   trunk/libmpcodecs/vd_sgi.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/vf_divtc.c
   trunk/libmpdemux/asf.h
   trunk/libmpdemux/aviheader.c
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/demux_mpc.c
   trunk/libmpdemux/demux_vqf.c
   trunk/libmpdemux/ebml.c
   trunk/libmpdemux/muxer_lavf.c
   trunk/libmpdemux/muxer_mpeg.c
   trunk/libvo/font_load_ft.c
   trunk/mp3lib/sr1.c
   trunk/stream/realrtsp/real.c
   trunk/stream/stream_cdda.c
   trunk/stream/stream_netstream.c
   trunk/vidix/drivers/mach64_vid.c
   trunk/vidix/drivers/nvidia_vid.c
   trunk/vidix/drivers/radeon_vid.c
   trunk/vidix/vidixlib.c

Log:
Remove bswap.h, use libavutil/bswap.h instead.


Modified: trunk/libaf/af_format.c
==============================================================================

--- trunk/libaf/af_format.c	(original)
+++ trunk/libaf/af_format.c	Wed Nov 29 16:02:45 2006
@@ -22,7 +22,8 @@
 #endif
 
 #include "af.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 /* Functions used by play to convert the input audio to the correct

Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c	(original)
+++ trunk/libao2/ao_dxr2.c	Wed Nov 29 16:02:45 2006
@@ -7,7 +7,8 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"

Modified: trunk/libao2/ao_pcm.c
==============================================================================
--- trunk/libao2/ao_pcm.c	(original)
+++ trunk/libao2/ao_pcm.c	Wed Nov 29 16:02:45 2006
@@ -4,7 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "subopt-helper.h"
 #include "libaf/af_format.h"
 #include "audio_out.h"

Modified: trunk/libdha/sysdep/pci_linux.c
==============================================================================
--- trunk/libdha/sysdep/pci_linux.c	(original)
+++ trunk/libdha/sysdep/pci_linux.c	Wed Nov 29 16:02:45 2006
@@ -132,7 +132,8 @@
 #include <fcntl.h>
 //#include <sys/io.h>
 #include <linux/pci.h>
-#include "../../bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 static int pci_get_vendor(
           unsigned char bus,

Modified: trunk/libmpcodecs/ad_dk3adpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_dk3adpcm.c	(original)
+++ trunk/libmpcodecs/ad_dk3adpcm.c	Wed Nov 29 16:02:45 2006
@@ -16,7 +16,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "ad_internal.h"
 
 static ad_info_t info = 

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	(original)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Wed Nov 29 16:02:45 2006
@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-#include "bswap.h"
+#include "libavutil/bswap.h"
 
 static ad_info_t info = 
 {

Modified: trunk/libmpcodecs/ad_imaadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_imaadpcm.c	(original)
+++ trunk/libmpcodecs/ad_imaadpcm.c	Wed Nov 29 16:02:45 2006
@@ -21,7 +21,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "ad_internal.h"
 
 #define MS_IMA_ADPCM_PREAMBLE_SIZE 4

Modified: trunk/libmpcodecs/ad_liba52.c
==============================================================================
--- trunk/libmpcodecs/ad_liba52.c	(original)
+++ trunk/libmpcodecs/ad_liba52.c	Wed Nov 29 16:02:45 2006
@@ -37,7 +37,7 @@
 float a52_drc_level = 1.0;
 static int a52_drc_action = DRC_NO_ACTION;
 
-#include "bswap.h"
+#include "libavutil/bswap.h"
 
 static ad_info_t info = 
 {

Modified: trunk/libmpcodecs/ad_msadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_msadpcm.c	(original)
+++ trunk/libmpcodecs/ad_msadpcm.c	Wed Nov 29 16:02:45 2006
@@ -12,7 +12,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "ad_internal.h"
 
 static ad_info_t info = 

Modified: trunk/libmpcodecs/native/RTjpegN.c
==============================================================================
--- trunk/libmpcodecs/native/RTjpegN.c	(original)
+++ trunk/libmpcodecs/native/RTjpegN.c	Wed Nov 29 16:02:45 2006
@@ -31,7 +31,8 @@
 #define MMX
 #endif
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "RTjpegN.h"
 
 #ifdef MMX

Modified: trunk/libmpcodecs/native/nuppelvideo.c
==============================================================================
--- trunk/libmpcodecs/native/nuppelvideo.c	(original)
+++ trunk/libmpcodecs/native/nuppelvideo.c	Wed Nov 29 16:02:45 2006
@@ -13,7 +13,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "../libvo/fastmemcpy.h"
 

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	(original)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Wed Nov 29 16:02:45 2006
@@ -7,7 +7,8 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "vd_internal.h"
 

Modified: trunk/libmpcodecs/vd_ijpg.c
==============================================================================
--- trunk/libmpcodecs/vd_ijpg.c	(original)
+++ trunk/libmpcodecs/vd_ijpg.c	Wed Nov 29 16:02:45 2006
@@ -11,7 +11,8 @@
 
 #include <setjmp.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"

Modified: trunk/libmpcodecs/vd_mpng.c
==============================================================================
--- trunk/libmpcodecs/vd_mpng.c	(original)
+++ trunk/libmpcodecs/vd_mpng.c	Wed Nov 29 16:02:45 2006
@@ -6,7 +6,8 @@
 
 #include <png.h>
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"

Modified: trunk/libmpcodecs/vd_mtga.c
==============================================================================
--- trunk/libmpcodecs/vd_mtga.c	(original)
+++ trunk/libmpcodecs/vd_mtga.c	Wed Nov 29 16:02:45 2006
@@ -10,7 +10,8 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"

Modified: trunk/libmpcodecs/vd_sgi.c
==============================================================================
--- trunk/libmpcodecs/vd_sgi.c	(original)
+++ trunk/libmpcodecs/vd_sgi.c	Wed Nov 29 16:02:45 2006
@@ -7,7 +7,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "vd_internal.h"
 
 #define SGI_HEADER_LEN 512

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	(original)
+++ trunk/libmpcodecs/ve_qtvideo.c	Wed Nov 29 16:02:45 2006
@@ -10,7 +10,8 @@
 
 #include "config.h"
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifdef WIN32_LOADER 
 #include "ldt_keeper.h" 

Modified: trunk/libmpcodecs/vf_divtc.c
==============================================================================
--- trunk/libmpcodecs/vf_divtc.c	(original)
+++ trunk/libmpcodecs/vf_divtc.c	Wed Nov 29 16:02:45 2006
@@ -7,7 +7,8 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "img_format.h"
 #include "mp_image.h"

Modified: trunk/libmpdemux/asf.h
==============================================================================
--- trunk/libmpdemux/asf.h	(original)
+++ trunk/libmpdemux/asf.h	Wed Nov 29 16:02:45 2006
@@ -3,7 +3,8 @@
 
 //#include "config.h"	/* for WORDS_BIGENDIAN */
 #include <inttypes.h>
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	(original)
+++ trunk/libmpdemux/aviheader.c	Wed Nov 29 16:02:45 2006
@@ -12,7 +12,6 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "bswap.h"
 #include "aviheader.h"
 
 #define MIN(a,b) (((a)<(b))?(a):(b))

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	(original)
+++ trunk/libmpdemux/aviheader.h	Wed Nov 29 16:02:45 2006
@@ -2,7 +2,8 @@
 #define	_aviheader_h
 
 //#include "config.h"	/* get correct definition WORDS_BIGENDIAN */
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))

Modified: trunk/libmpdemux/demux_mpc.c
==============================================================================
--- trunk/libmpdemux/demux_mpc.c	(original)
+++ trunk/libmpdemux/demux_mpc.c	Wed Nov 29 16:02:45 2006
@@ -11,7 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"

Modified: trunk/libmpdemux/demux_vqf.c
==============================================================================
--- trunk/libmpdemux/demux_vqf.c	(original)
+++ trunk/libmpdemux/demux_vqf.c	Wed Nov 29 16:02:45 2006
@@ -2,7 +2,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "stream.h"
 #include "demuxer.h"

Modified: trunk/libmpdemux/ebml.c
==============================================================================
--- trunk/libmpdemux/ebml.c	(original)
+++ trunk/libmpdemux/ebml.c	Wed Nov 29 16:02:45 2006
@@ -11,7 +11,8 @@
 
 #include "stream.h"
 #include "ebml.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 
 #ifndef SIZE_MAX

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	(original)
+++ trunk/libmpdemux/muxer_lavf.c	Wed Nov 29 16:02:45 2006
@@ -9,7 +9,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 

Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c	(original)
+++ trunk/libmpdemux/muxer_mpeg.c	Wed Nov 29 16:02:45 2006
@@ -9,8 +9,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "bswap.h"
-
 #include "aviheader.h"
 #include "ms_hdr.h"
 

Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c	(original)
+++ trunk/libvo/font_load_ft.c	Wed Nov 29 16:02:45 2006
@@ -28,7 +28,8 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "font_load.h"
 #include "mp_msg.h"
 #include "mplayer.h"

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	(original)
+++ trunk/mp3lib/sr1.c	Wed Nov 29 16:02:45 2006
@@ -24,7 +24,8 @@
 #include "mpg123.h"
 #include "huffman.h"
 #include "mp3.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "cpudetect.h"
 //#include "liba52/mm_accel.h"
 #include "mp_msg.h"

Modified: trunk/stream/realrtsp/real.c
==============================================================================
--- trunk/stream/realrtsp/real.c	(original)
+++ trunk/stream/realrtsp/real.c	Wed Nov 29 16:02:45 2006
@@ -31,7 +31,8 @@
 #include <string.h>
 
 #include "../config.h"
-#include "../bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 #include "real.h"
 #include "asmrp.h"
 #include "sdpplin.h"

Modified: trunk/stream/stream_cdda.c
==============================================================================
--- trunk/stream/stream_cdda.c	(original)
+++ trunk/stream/stream_cdda.c	Wed Nov 29 16:02:45 2006
@@ -3,7 +3,8 @@
 #include "stream.h"
 #include "m_option.h"
 #include "m_struct.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/stream/stream_netstream.c
==============================================================================
--- trunk/stream/stream_netstream.c	(original)
+++ trunk/stream/stream_netstream.c	Wed Nov 29 16:02:45 2006
@@ -60,7 +60,8 @@
 #include "help_mp.h"
 #include "m_option.h"
 #include "m_struct.h"
-#include "bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/bswap.h"
 
 #include "netstream.h"
 #include "tcp.h"

Modified: trunk/vidix/drivers/mach64_vid.c
==============================================================================
--- trunk/vidix/drivers/mach64_vid.c	(original)
+++ trunk/vidix/drivers/mach64_vid.c	Wed Nov 29 16:02:45 2006
@@ -14,7 +14,8 @@
 #include <fcntl.h>
 
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.h"
 #include "../vidix.h"
 #include "../fourcc.h"
 #include "../../libdha/libdha.h"

Modified: trunk/vidix/drivers/nvidia_vid.c
==============================================================================
--- trunk/vidix/drivers/nvidia_vid.c	(original)
+++ trunk/vidix/drivers/nvidia_vid.c	Wed Nov 29 16:02:45 2006
@@ -24,7 +24,8 @@
 #include "../../libdha/pci_ids.h"
 #include "../../libdha/pci_names.h"
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.h"
 
 
 pciinfo_t pci_info;

Modified: trunk/vidix/drivers/radeon_vid.c
==============================================================================
--- trunk/vidix/drivers/radeon_vid.c	(original)
+++ trunk/vidix/drivers/radeon_vid.c	Wed Nov 29 16:02:45 2006
@@ -17,7 +17,8 @@
 #include <inttypes.h>
 
 #include "../../config.h"
-#include "../../bswap.h"
+#include "../../libavutil/common.h"
+#include "../../libavutil/bswap.h"
 #include "../../libdha/pci_ids.h"
 #include "../../libdha/pci_names.h"
 #include "../vidix.h"

Modified: trunk/vidix/vidixlib.c
==============================================================================
--- trunk/vidix/vidixlib.c	(original)
+++ trunk/vidix/vidixlib.c	Wed Nov 29 16:02:45 2006
@@ -43,8 +43,9 @@
 #endif
 
 #include "vidixlib.h"
-#include "../config.h" 
-#include "../bswap.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../libavutil/bswap.h"
 
 static char drv_name[FILENAME_MAX];
 

