[FFmpeg-cvslog] r14500 - in trunk/libavformat: avformat.h ffm.h nut.h oggdec.h os_support.h raw.h rm.h rtp.h rtp_aac.h rtp_h264.h rtp_mpv.h swf.h

michael subversion
Sat Aug 2 00:29:30 CEST 2008


Author: michael
Date: Sat Aug  2 00:29:29 2008
New Revision: 14500

Log:
Revert r14497
	Log:
	Add missing header #includes.
Policy violation (change not approved by maintainer)
and while discussions where ongoing and no consensus has been reached.


Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/ffm.h
   trunk/libavformat/nut.h
   trunk/libavformat/oggdec.h
   trunk/libavformat/os_support.h
   trunk/libavformat/raw.h
   trunk/libavformat/rm.h
   trunk/libavformat/rtp.h
   trunk/libavformat/rtp_aac.h
   trunk/libavformat/rtp_h264.h
   trunk/libavformat/rtp_mpv.h
   trunk/libavformat/swf.h

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	(original)
+++ trunk/libavformat/avformat.h	Sat Aug  2 00:29:29 2008
@@ -35,7 +35,6 @@
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 
-#include <stdint.h>
 #include <time.h>
 #include <stdio.h>  /* FILE */
 #include "libavcodec/avcodec.h"

Modified: trunk/libavformat/ffm.h
==============================================================================
--- trunk/libavformat/ffm.h	(original)
+++ trunk/libavformat/ffm.h	Sat Aug  2 00:29:29 2008
@@ -22,9 +22,7 @@
 #ifndef FFMPEG_FFM_H
 #define FFMPEG_FFM_H
 
-#include <stdint.h>
 #include "avformat.h"
-#include "avio.h"
 
 /* The FFM file is made of blocks of fixed size */
 #define FFM_HEADER_SIZE 14

Modified: trunk/libavformat/nut.h
==============================================================================
--- trunk/libavformat/nut.h	(original)
+++ trunk/libavformat/nut.h	Sat Aug  2 00:29:29 2008
@@ -22,7 +22,6 @@
 #ifndef FFMPEG_NUT_H
 #define FFMPEG_NUT_H
 
-#include <stdint.h>
 //#include <limits.h>
 //#include "libavutil/adler32.h"
 //#include "libavcodec/mpegaudio.h"

Modified: trunk/libavformat/oggdec.h
==============================================================================
--- trunk/libavformat/oggdec.h	(original)
+++ trunk/libavformat/oggdec.h	Sat Aug  2 00:29:29 2008
@@ -25,7 +25,6 @@
 #ifndef FFMPEG_OGGDEC_H
 #define FFMPEG_OGGDEC_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 typedef struct ogg_codec {

Modified: trunk/libavformat/os_support.h
==============================================================================
--- trunk/libavformat/os_support.h	(original)
+++ trunk/libavformat/os_support.h	Sat Aug  2 00:29:29 2008
@@ -27,8 +27,6 @@
  * miscellaneous OS support macros and functions.
  */
 
-#include "config.h"
-
 #ifdef __MINGW32__
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>

Modified: trunk/libavformat/raw.h
==============================================================================
--- trunk/libavformat/raw.h	(original)
+++ trunk/libavformat/raw.h	Sat Aug  2 00:29:29 2008
@@ -22,7 +22,6 @@
 #ifndef FFMPEG_RAW_H
 #define FFMPEG_RAW_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 int pcm_read_seek(AVFormatContext *s,

Modified: trunk/libavformat/rm.h
==============================================================================
--- trunk/libavformat/rm.h	(original)
+++ trunk/libavformat/rm.h	Sat Aug  2 00:29:29 2008
@@ -22,7 +22,6 @@
 #ifndef FFMPEG_RM_H
 #define FFMPEG_RM_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 

Modified: trunk/libavformat/rtp.h
==============================================================================
--- trunk/libavformat/rtp.h	(original)
+++ trunk/libavformat/rtp.h	Sat Aug  2 00:29:29 2008
@@ -21,7 +21,6 @@
 #ifndef FFMPEG_RTP_H
 #define FFMPEG_RTP_H
 
-#include <stdint.h>
 #include "libavcodec/avcodec.h"
 #include "avformat.h"
 

Modified: trunk/libavformat/rtp_aac.h
==============================================================================
--- trunk/libavformat/rtp_aac.h	(original)
+++ trunk/libavformat/rtp_aac.h	Sat Aug  2 00:29:29 2008
@@ -20,7 +20,6 @@
 #ifndef FFMPEG_RTP_AAC_H
 #define FFMPEG_RTP_AAC_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);

Modified: trunk/libavformat/rtp_h264.h
==============================================================================
--- trunk/libavformat/rtp_h264.h	(original)
+++ trunk/libavformat/rtp_h264.h	Sat Aug  2 00:29:29 2008
@@ -22,7 +22,6 @@
 #ifndef FFMPEG_RTP_H264_H
 #define FFMPEG_RTP_H264_H
 
-#include <stdint.h>
 #include "rtp_internal.h"
 
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;

Modified: trunk/libavformat/rtp_mpv.h
==============================================================================
--- trunk/libavformat/rtp_mpv.h	(original)
+++ trunk/libavformat/rtp_mpv.h	Sat Aug  2 00:29:29 2008
@@ -20,7 +20,6 @@
 #ifndef FFMPEG_RTP_MPV_H
 #define FFMPEG_RTP_MPV_H
 
-#include <stdint.h>
 #include "avformat.h"
 
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);

Modified: trunk/libavformat/swf.h
==============================================================================
--- trunk/libavformat/swf.h	(original)
+++ trunk/libavformat/swf.h	Sat Aug  2 00:29:29 2008
@@ -25,7 +25,6 @@
 
 #include "libavutil/fifo.h"
 #include "avformat.h"
-#include "avio.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */




More information about the ffmpeg-cvslog mailing list