summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 12:25:54 +0100
committerAnton Khirnov <anton@khirnov.net>2011-04-19 18:28:38 +0200
commit761ad429680637411882552921a9d5acb6aff59e (patch)
treeba03954b8cfd4196ff5d6016d292a0d203faaf87 /ffserver.c
parentaad2f2f477d6804f5f79ccce55b3d7f54b00f715 (diff)
downloadffmpeg-761ad429680637411882552921a9d5acb6aff59e.tar.gz
lavf: remove FF_API_MAX_STREAMS cruft
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/ffserver.c b/ffserver.c
index 36cd9cedbc..079be03994 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -95,9 +95,7 @@ static const char *http_state[] = {
"RTSP_SEND_PACKET",
};
-#if !FF_API_MAX_STREAMS
#define MAX_STREAMS 20
-#endif
#define IOBUFFER_INIT_SIZE 8192
@@ -2944,11 +2942,9 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
snprintf(avc->filename, 1024, "rtp://0.0.0.0");
}
-#if !FF_API_MAX_STREAMS
if (avc->nb_streams >= INT_MAX/sizeof(*avc->streams) ||
!(avc->streams = av_malloc(avc->nb_streams * sizeof(*avc->streams))))
goto sdp_done;
-#endif
if (avc->nb_streams >= INT_MAX/sizeof(*avs) ||
!(avs = av_malloc(avc->nb_streams * sizeof(*avs))))
goto sdp_done;
@@ -2961,9 +2957,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
av_sdp_create(&avc, 1, *pbuffer, 2048);
sdp_done:
-#if !FF_API_MAX_STREAMS
av_free(avc->streams);
-#endif
av_metadata_free(&avc->metadata);
av_free(avc);
av_free(avs);