[SCM] libav/experimental: move unrelated functions declarations out of allformats.h

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7241a6bb5020a05ed5a3dddca28703b912492d2e
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Tue Sep 11 09:27:46 2007 +0000

    move unrelated functions declarations out of allformats.h
    
    Originally committed as revision 10475 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 6f1d9cd..ea98554 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 #include "intfloat_readwrite.h"
 
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index b991a93..0a783ba 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -20,6 +20,7 @@
  */
 #include "avformat.h"
 #include "allformats.h"
+#include "rtp_internal.h"
 
 #define REGISTER_MUXER(X,x) \
           if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer)
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 88da77b..eb51c96 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -195,13 +195,4 @@ extern URLProtocol rtp_protocol;
 extern URLProtocol tcp_protocol;
 extern URLProtocol udp_protocol;
 
-/* raw.c */
-int pcm_read_seek(AVFormatContext *s,
-                  int stream_index, int64_t timestamp, int flags);
-
-/* rtsp.c */
-int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
-/* rtp.c */
-void av_register_rtp_dynamic_payload_handlers(void);
-
 #endif
diff --git a/libavformat/au.c b/libavformat/au.c
index bd26e54..dd9d708 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -28,7 +28,7 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 /* if we don't know the size in advance */
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 7fcbde9..be4c6e3 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 typedef struct {
diff --git a/libavformat/raw.c b/libavformat/raw.c
index bf0a111..bd93803 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -21,6 +21,7 @@
  */
 #include "avformat.h"
 #include "ac3_parser.h"
+#include "raw.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */
diff --git a/libavcodec/h263_parser.h b/libavformat/raw.h
similarity index 73%
copy from libavcodec/h263_parser.h
copy to libavformat/raw.h
index db6c8a4..ce3e45c 100644
--- a/libavcodec/h263_parser.h
+++ b/libavformat/raw.h
@@ -1,6 +1,6 @@
 /*
- * H.263 parser
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni at gmx.at>
+ * RAW muxer and demuxer
+ * Copyright (C) 2007  Aurelien Jacobs <aurel at gnuage.org>
  *
  * This file is part of FFmpeg.
  *
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H263_PARSER_H
-#define AVCODEC_H263_PARSER_H
+#ifndef AVFORMAT_RAW_H
+#define AVFORMAT_RAW_H
 
-#include "parser.h"
+#include "avformat.h"
 
-int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+int pcm_read_seek(AVFormatContext *s,
+                  int stream_index, int64_t timestamp, int flags);
 
-#endif // AVCODEC_H263_PARSER_H
+#endif /* AVFORMAT_RAW_H */
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index b03f74e..9647762 100644
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -112,5 +112,8 @@ extern RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler;
 int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers.
 
 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
+
+void av_register_rtp_dynamic_payload_handlers(void);
+
 #endif /* RTP_INTERNAL_H */
 
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 6ab70ee..3d2456d 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -24,7 +24,7 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 #include "bswap.h"
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 47ac5c0..e80e579 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -469,6 +469,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
     /* XXX: suppress this hack for redirectors */
 #ifdef CONFIG_REDIR_DEMUXER
     if (fmt == &redir_demuxer) {
+        int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
         err = redir_open(ic_ptr, pb);
         url_fclose(pb);
         return err;
diff --git a/libavformat/wav.c b/libavformat/wav.c
index cb748a9..9fccf64 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
 #include "riff.h"
 
 typedef struct {

-- 
Libav/FFmpeg packaging