[FFmpeg-cvslog] r10475 - in trunk/libavformat: aiff.c allformats.c allformats.h au.c mmf.c raw.c raw.h rtp_internal.h sol.c utils.c wav.c
aurel
subversion
Tue Sep 11 11:27:46 CEST 2007
Author: aurel
Date: Tue Sep 11 11:27:46 2007
New Revision: 10475
Log:
move unrelated functions declarations out of allformats.h
Added:
trunk/libavformat/raw.h
Modified:
trunk/libavformat/aiff.c
trunk/libavformat/allformats.c
trunk/libavformat/allformats.h
trunk/libavformat/au.c
trunk/libavformat/mmf.c
trunk/libavformat/raw.c
trunk/libavformat/rtp_internal.h
trunk/libavformat/sol.c
trunk/libavformat/utils.c
trunk/libavformat/wav.c
Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c (original)
+++ trunk/libavformat/aiff.c Tue Sep 11 11:27:46 2007
@@ -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"
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c (original)
+++ trunk/libavformat/allformats.c Tue Sep 11 11:27:46 2007
@@ -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)
Modified: trunk/libavformat/allformats.h
==============================================================================
--- trunk/libavformat/allformats.h (original)
+++ trunk/libavformat/allformats.h Tue Sep 11 11:27:46 2007
@@ -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
Modified: trunk/libavformat/au.c
==============================================================================
--- trunk/libavformat/au.c (original)
+++ trunk/libavformat/au.c Tue Sep 11 11:27:46 2007
@@ -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 */
Modified: trunk/libavformat/mmf.c
==============================================================================
--- trunk/libavformat/mmf.c (original)
+++ trunk/libavformat/mmf.c Tue Sep 11 11:27:46 2007
@@ -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 {
Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c (original)
+++ trunk/libavformat/raw.c Tue Sep 11 11:27:46 2007
@@ -21,6 +21,7 @@
*/
#include "avformat.h"
#include "ac3_parser.h"
+#include "raw.h"
#ifdef CONFIG_MUXERS
/* simple formats */
Added: trunk/libavformat/raw.h
==============================================================================
--- (empty file)
+++ trunk/libavformat/raw.h Tue Sep 11 11:27:46 2007
@@ -0,0 +1,30 @@
+/*
+ * RAW muxer and demuxer
+ * Copyright (C) 2007 Aurelien Jacobs <aurel at gnuage.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_RAW_H
+#define AVFORMAT_RAW_H
+
+#include "avformat.h"
+
+int pcm_read_seek(AVFormatContext *s,
+ int stream_index, int64_t timestamp, int flags);
+
+#endif /* AVFORMAT_RAW_H */
Modified: trunk/libavformat/rtp_internal.h
==============================================================================
--- trunk/libavformat/rtp_internal.h (original)
+++ trunk/libavformat/rtp_internal.h Tue Sep 11 11:27:46 2007
@@ -112,5 +112,8 @@ extern RTPDynamicProtocolHandler *RTPFir
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 */
Modified: trunk/libavformat/sol.c
==============================================================================
--- trunk/libavformat/sol.c (original)
+++ trunk/libavformat/sol.c Tue Sep 11 11:27:46 2007
@@ -24,7 +24,7 @@
*/
#include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
#include "riff.h"
#include "bswap.h"
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c (original)
+++ trunk/libavformat/utils.c Tue Sep 11 11:27:46 2007
@@ -469,6 +469,7 @@ int av_open_input_file(AVFormatContext *
/* 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;
Modified: trunk/libavformat/wav.c
==============================================================================
--- trunk/libavformat/wav.c (original)
+++ trunk/libavformat/wav.c Tue Sep 11 11:27:46 2007
@@ -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 {
More information about the ffmpeg-cvslog
mailing list