Commit 7241a6bb authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

move unrelated functions declarations out of allformats.h

Originally committed as revision 10475 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b156b88c
......@@ -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"
......
......@@ -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)
......
......@@ -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
......@@ -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 */
......
......@@ -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 {
......
......@@ -21,6 +21,7 @@
*/
#include "avformat.h"
#include "ac3_parser.h"
#include "raw.h"
#ifdef CONFIG_MUXERS
/* simple formats */
......
/*
* 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 */
......@@ -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 */
......@@ -24,7 +24,7 @@
*/
#include "avformat.h"
#include "allformats.h"
#include "raw.h"
#include "riff.h"
#include "bswap.h"
......
......@@ -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;
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment