changeset 4201:7d2f3f1b68d8 libavformat

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
author diego
date Sun, 11 Jan 2009 22:19:48 +0000
parents 898c3d1d9e4e
children baf5439883f1
files 4xm.c ape.c avc.c bethsoftvid.c bfi.c dsicin.c dxa.c electronicarts.c ffmdec.c ffmenc.c flic.c idcin.c idroq.c iff.c ipmovie.c lmlm4.c matroskadec.c matroskaenc.c mm.c mov.c mpegts.c mpegtsenc.c nutdec.c nutenc.c nuv.c psxstr.c rl2.c rmdec.c rtsp.c segafilm.c sierravmd.c siff.c smacker.c swfdec.c thp.c txd.c vc1test.c vocdec.c wc3movie.c westwood.c wv.c xa.c
diffstat 42 files changed, 44 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/4xm.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/4xm.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define     RIFF_TAG MKTAG('R', 'I', 'F', 'F')
--- a/ape.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/ape.c	Sun Jan 11 22:19:48 2009 +0000
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define ENABLE_DEBUG 0
--- a/avc.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/avc.c	Sun Jan 11 22:19:48 2009 +0000
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio.h"
 
--- a/bethsoftvid.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/bethsoftvid.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  * @sa http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "libavcodec/bethsoftvideo.h"
 
--- a/bfi.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/bfi.c	Sun Jan 11 22:19:48 2009 +0000
@@ -26,6 +26,7 @@
  * @sa http://wiki.multimedia.cx/index.php?title=BFI
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 typedef struct BFIContext {
--- a/dsicin.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/dsicin.c	Sun Jan 11 22:19:48 2009 +0000
@@ -24,6 +24,7 @@
  * Delphine Software International CIN file demuxer
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 
--- a/dxa.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/dxa.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
--- a/electronicarts.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/electronicarts.c	Sun Jan 11 22:19:48 2009 +0000
@@ -25,6 +25,7 @@
  * by Robin Kay (komadori at gekkou.co.uk)
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
--- a/ffmdec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/ffmdec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 #ifdef CONFIG_FFSERVER
--- a/ffmenc.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/ffmenc.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 
--- a/flic.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/flic.c	Sun Jan 11 22:19:48 2009 +0000
@@ -31,6 +31,7 @@
  * handles special FLIs from the PC game "Magic Carpet".
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define FLIC_FILE_MAGIC_1 0xAF11
--- a/idcin.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/idcin.c	Sun Jan 11 22:19:48 2009 +0000
@@ -68,6 +68,7 @@
  *       transmitting them to the video decoder
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define HUFFMAN_TABLE_SIZE (64 * 1024)
--- a/idroq.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/idroq.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://www.csse.monash.edu.au/~timf/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define RoQ_MAGIC_NUMBER 0x1084
--- a/iff.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/iff.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  * http://wiki.multimedia.cx/index.php?title=IFF
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define ID_8SVX       MKTAG('8','S','V','X')
--- a/ipmovie.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/ipmovie.c	Sun Jan 11 22:19:48 2009 +0000
@@ -32,6 +32,7 @@
  * up and sending out the chunks.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 /* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely
--- a/lmlm4.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/lmlm4.c	Sun Jan 11 22:19:48 2009 +0000
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define LMLM4_I_FRAME   0x00
--- a/matroskadec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/matroskadec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -36,6 +36,7 @@
 #include "matroska.h"
 #include "libavcodec/mpeg4audio.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/avstring.h"
 #include "libavutil/lzo.h"
 #ifdef CONFIG_ZLIB
--- a/matroskaenc.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/matroskaenc.c	Sun Jan 11 22:19:48 2009 +0000
@@ -24,6 +24,7 @@
 #include "isom.h"
 #include "matroska.h"
 #include "avc.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/md5.h"
 #include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
--- a/mm.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/mm.c	Sun Jan 11 22:19:48 2009 +0000
@@ -31,6 +31,7 @@
  *  http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define MM_PREAMBLE_SIZE    6
--- a/mov.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/mov.c	Sun Jan 11 22:19:48 2009 +0000
@@ -23,6 +23,7 @@
 
 //#define DEBUG
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 #include "isom.h"
--- a/mpegts.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/mpegts.c	Sun Jan 11 22:19:48 2009 +0000
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "mpegts.h"
 #include "internal.h"
--- a/mpegtsenc.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/mpegtsenc.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "avformat.h"
 #include "mpegts.h"
--- a/nutdec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/nutdec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
 #include "libavutil/tree.h"
 #include "nut.h"
 
--- a/nutenc.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/nutenc.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "libavutil/tree.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
--- a/nuv.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/nuv.c	Sun Jan 11 22:19:48 2009 +0000
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
--- a/psxstr.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/psxstr.c	Sun Jan 11 22:19:48 2009 +0000
@@ -29,6 +29,7 @@
  * RIFF headers, followed by CD sectors.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
--- a/rl2.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/rl2.c	Sun Jan 11 22:19:48 2009 +0000
@@ -33,6 +33,7 @@
  * optional background_frame
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette
--- a/rmdec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/rmdec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "rm.h"
 
--- a/rtsp.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/rtsp.c	Sun Jan 11 22:19:48 2009 +0000
@@ -23,6 +23,7 @@
 #define _SVID_SOURCE
 
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #include <sys/time.h>
--- a/segafilm.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/segafilm.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define FILM_TAG MKBETAG('F', 'I', 'L', 'M')
--- a/sierravmd.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/sierravmd.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define VMD_HEADER_SIZE 0x0330
--- a/siff.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/siff.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 enum SIFFTags{
--- a/smacker.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/smacker.c	Sun Jan 11 22:19:48 2009 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define SMACKER_PAL 0x01
--- a/swfdec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/swfdec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "swf.h"
 
 static int get_swf_tag(ByteIOContext *pb, int *len_ptr)
--- a/thp.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/thp.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 typedef struct ThpDemuxContext {
--- a/txd.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/txd.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define TXD_FILE            0x16
--- a/vc1test.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/vc1test.c	Sun Jan 11 22:19:48 2009 +0000
@@ -26,6 +26,7 @@
  * Format specified in SMPTE standard 421 Annex L
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define VC1_EXTRADATA_SIZE 4
--- a/vocdec.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/vocdec.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "voc.h"
 
 
--- a/wc3movie.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/wc3movie.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define WC3_PREAMBLE_SIZE 8
--- a/westwood.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/westwood.c	Sun Jan 11 22:19:48 2009 +0000
@@ -33,6 +33,7 @@
  * qualify a file. Refer to wsaud_probe() for the precise parameters.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define AUD_HEADER_SIZE 12
--- a/wv.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/wv.c	Sun Jan 11 22:19:48 2009 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 // specs say that maximum block size is 1Mb
--- a/xa.c	Sun Jan 11 22:05:43 2009 +0000
+++ b/xa.c	Sun Jan 11 22:19:48 2009 +0000
@@ -27,6 +27,7 @@
  *   http://wiki.multimedia.cx/index.php?title=Maxis_XA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define XA00_TAG MKTAG('X', 'A', 0, 0)