Mercurial > libavformat.hg
changeset 2545:213268d7594e libavformat
move unrelated functions declarations out of allformats.h
| author | aurel |
|---|---|
| date | Tue, 11 Sep 2007 09:27:46 +0000 |
| parents | 0318af3025dd |
| children | 015aa98f3f12 |
| files | aiff.c allformats.c allformats.h au.c mmf.c raw.c raw.h rtp_internal.h sol.c utils.c wav.c |
| diffstat | 11 files changed, 41 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/aiff.c Mon Sep 10 22:48:42 2007 +0000 +++ b/aiff.c Tue Sep 11 09:27:46 2007 +0000 @@ -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"
--- a/allformats.c Mon Sep 10 22:48:42 2007 +0000 +++ b/allformats.c Tue Sep 11 09:27:46 2007 +0000 @@ -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)
--- a/allformats.h Mon Sep 10 22:48:42 2007 +0000 +++ b/allformats.h Tue Sep 11 09:27:46 2007 +0000 @@ -195,13 +195,4 @@ 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
--- a/au.c Mon Sep 10 22:48:42 2007 +0000 +++ b/au.c Tue Sep 11 09:27:46 2007 +0000 @@ -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 */
--- a/mmf.c Mon Sep 10 22:48:42 2007 +0000 +++ b/mmf.c Tue Sep 11 09:27:46 2007 +0000 @@ -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 {
--- a/raw.c Mon Sep 10 22:48:42 2007 +0000 +++ b/raw.c Tue Sep 11 09:27:46 2007 +0000 @@ -21,6 +21,7 @@ */ #include "avformat.h" #include "ac3_parser.h" +#include "raw.h" #ifdef CONFIG_MUXERS /* simple formats */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/raw.h Tue Sep 11 09:27:46 2007 +0000 @@ -0,0 +1,30 @@ +/* + * RAW muxer and demuxer + * Copyright (C) 2007 Aurelien Jacobs <aurel@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 */
--- a/rtp_internal.h Mon Sep 10 22:48:42 2007 +0000 +++ b/rtp_internal.h Tue Sep 11 09:27:46 2007 +0000 @@ -112,5 +112,8 @@ 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 */
--- a/sol.c Mon Sep 10 22:48:42 2007 +0000 +++ b/sol.c Tue Sep 11 09:27:46 2007 +0000 @@ -24,7 +24,7 @@ */ #include "avformat.h" -#include "allformats.h" +#include "raw.h" #include "riff.h" #include "bswap.h"
--- a/utils.c Mon Sep 10 22:48:42 2007 +0000 +++ b/utils.c Tue Sep 11 09:27:46 2007 +0000 @@ -469,6 +469,7 @@ /* 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;