Commit 6a5d31ac authored by Diego Biurrun's avatar Diego Biurrun

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.

Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7b04b8a0
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* 4XM codec. * 4XM codec.
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "bitstream.h" #include "bitstream.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "adx.h" #include "adx.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "adx.h" #include "adx.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define AVCODEC_BYTESTREAM_H #define AVCODEC_BYTESTREAM_H
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#define DEF_T(type, name, bytes, read, write) \ #define DEF_T(type, name, bytes, read, write) \
static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\ static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* @author Marco Gerards <marco@gnu.org> * @author Marco Gerards <marco@gnu.org>
*/ */
#include "libavutil/intreadwrite.h"
#include "parser.h" #include "parser.h"
#define DIRAC_PARSE_INFO_PREFIX 0x42424344 #define DIRAC_PARSE_INFO_PREFIX 0x42424344
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
* the fourcc 'Axan' in the 'auds' chunk of the AVI header. * the fourcc 'Axan' in the 'auds' chunk of the AVI header.
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct DPCMContext { typedef struct DPCMContext {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#ifndef AVCODEC_DSPUTIL_H #ifndef AVCODEC_DSPUTIL_H
#define AVCODEC_DSPUTIL_H #define AVCODEC_DSPUTIL_H
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
/* parser definition */ /* parser definition */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include <zlib.h> #include <zlib.h>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct CmvContext { typedef struct CmvContext {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/bswap.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define FLI_256_COLOR 4 #define FLI_256_COLOR 4
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct H264BSFContext { typedef struct H264BSFContext {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#include "mlp.h" #include "mlp.h"
const uint8_t ff_mlp_huffman_tables[3][18][2] = { const uint8_t ff_mlp_huffman_tables[3][18][2] = {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM * http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define MM_PREAMBLE_SIZE 6 #define MM_PREAMBLE_SIZE 6
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
* http://www.multimedia.cx/msrle.txt * http://www.multimedia.cx/msrle.txt
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define FETCH_NEXT_STREAM_BYTE() \ #define FETCH_NEXT_STREAM_BYTE() \
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define PALETTE_COUNT 256 #define PALETTE_COUNT 256
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct PTXContext { typedef struct PTXContext {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* Apple QuickDraw codec. * Apple QuickDraw codec.
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct QdrawContext{ typedef struct QdrawContext{
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct QtrleContext { typedef struct QtrleContext {
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct RpzaContext { typedef struct RpzaContext {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "s3tc.h" #include "s3tc.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define CPAIR 2 #define CPAIR 2
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define RT_OLD 0 #define RT_OLD 0
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
enum TargaCompr{ enum TargaCompr{
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "rle.h" #include "rle.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "truespeech_data.h" #include "truespeech_data.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "s3tc.h" #include "s3tc.h"
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define VMD_HEADER_SIZE 0x330 #define VMD_HEADER_SIZE 0x330
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
enum EncTypes { enum EncTypes {
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#define PALETTE_COUNT 256 #define PALETTE_COUNT 256
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
/** /**
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct XanContext { typedef struct XanContext {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "xiph.h" #include "xiph.h"
int ff_split_xiph_headers(uint8_t *extradata, int extradata_size, int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* Miro VideoXL codec. * Miro VideoXL codec.
*/ */
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
typedef struct VideoXLContext{ typedef struct VideoXLContext{
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include <zlib.h> #include <zlib.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include <zlib.h> #include <zlib.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* http://www.pcisys.net/~melanson/codecs/ * http://www.pcisys.net/~melanson/codecs/
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') #define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define ENABLE_DEBUG 0 #define ENABLE_DEBUG 0
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "avio.h" #include "avio.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* @sa http://www.svatopluk.com/andux/docs/dfvid.html * @sa http://www.svatopluk.com/andux/docs/dfvid.html
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "libavcodec/bethsoftvideo.h" #include "libavcodec/bethsoftvideo.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
* @sa http://wiki.multimedia.cx/index.php?title=BFI * @sa http://wiki.multimedia.cx/index.php?title=BFI
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
typedef struct BFIContext { typedef struct BFIContext {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* Delphine Software International CIN file demuxer * Delphine Software International CIN file demuxer
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "riff.h" #include "riff.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* by Robin Kay (komadori at gekkou.co.uk) * by Robin Kay (komadori at gekkou.co.uk)
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define SCHl_TAG MKTAG('S', 'C', 'H', 'l') #define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "ffm.h" #include "ffm.h"
#ifdef CONFIG_FFSERVER #ifdef CONFIG_FFSERVER
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "ffm.h" #include "ffm.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* handles special FLIs from the PC game "Magic Carpet". * handles special FLIs from the PC game "Magic Carpet".
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_1 0xAF11
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
* transmitting them to the video decoder * transmitting them to the video decoder
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define HUFFMAN_TABLE_SIZE (64 * 1024) #define HUFFMAN_TABLE_SIZE (64 * 1024)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* http://www.csse.monash.edu.au/~timf/ * http://www.csse.monash.edu.au/~timf/
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define RoQ_MAGIC_NUMBER 0x1084 #define RoQ_MAGIC_NUMBER 0x1084
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* http://wiki.multimedia.cx/index.php?title=IFF * http://wiki.multimedia.cx/index.php?title=IFF
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#define ID_8SVX MKTAG('8','S','V','X') #define ID_8SVX MKTAG('8','S','V','X')
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
* up and sending out the chunks. * up and sending out the chunks.
*/ */
#include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
/* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely /* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@