aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-09-10 22:48:42 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-09-10 22:48:42 +0000
commitb156b88c13ddc9b6bbd5d60f85328fea5a7fd9cf (patch)
tree32c8e98835dc90203bdfc7cc30430523a3fa362c /ffserver.c
parentac6577cd71e5d2e48728a04a4050a28b454d4ed5 (diff)
downloadffmpeg-b156b88c13ddc9b6bbd5d60f85328fea5a7fd9cf.tar.gz
rtp and rtsp demuxer declarations are not part of public API
Originally committed as revision 10474 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c
index dce934e82e..0b21cc41a4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1627,7 +1627,7 @@ static void compute_stats(HTTPContext *c)
strcpy(eosf - 4, ".asx");
else if (strcmp(eosf - 3, ".rm") == 0)
strcpy(eosf - 3, ".ram");
- else if (stream->fmt == &rtp_muxer) {
+ else if (!strcmp(stream->fmt->name, "rtp")) {
/* generate a sample RTSP director if
unicast. Generate an SDP redirector if
multicast */
@@ -2683,7 +2683,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
path++;
for(stream = first_stream; stream != NULL; stream = stream->next) {
- if (!stream->is_feed && stream->fmt == &rtp_muxer &&
+ if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp") &&
!strcmp(path, stream->filename)) {
goto found;
}
@@ -2758,7 +2758,7 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
/* now check each stream */
for(stream = first_stream; stream != NULL; stream = stream->next) {
- if (!stream->is_feed && stream->fmt == &rtp_muxer) {
+ if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp")) {
/* accept aggregate filenames only if single stream */
if (!strcmp(path, stream->filename)) {
if (stream->nb_streams != 1) {
@@ -3076,7 +3076,7 @@ static int rtp_new_av_stream(HTTPContext *c,
ctx = av_alloc_format_context();
if (!ctx)
return -1;
- ctx->oformat = &rtp_muxer;
+ ctx->oformat = guess_format("rtp", NULL, NULL);
st = av_mallocz(sizeof(AVStream));
if (!st)
@@ -3295,7 +3295,7 @@ static void build_file_streams(void)
/* try to open the file */
/* open stream */
stream->ap_in = av_mallocz(sizeof(AVFormatParameters));
- if (stream->fmt == &rtp_muxer) {
+ if (!strcmp(stream->fmt->name, "rtp")) {
/* specific case : if transport stream output to RTP,
we use a raw transport stream reader */
stream->ap_in->mpeg2ts_raw = 1;