virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

give AVInput/OutputFormat structs consistent names

Browse Source 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2006-07-09 23:40:53 +00:00
parent 21227514de
commit d2a067d1d9
72 changed files with 299 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffserver.c
View File

@@ -1624,7 +1624,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_mux) {
} else if (stream->fmt == &rtp_muxer) {
/* generate a sample RTSP director if
unicast. Generate an SDP redirector if
multicast */
@@ -2720,7 +2720,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_mux &&
if (!stream->is_feed && stream->fmt == &rtp_muxer &&
!strcmp(path, stream->filename)) {
goto found;
}
@@ -2795,7 +2795,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_mux) {
if (!stream->is_feed && stream->fmt == &rtp_muxer) {
/* accept aggregate filenames only if single stream */
if (!strcmp(path, stream->filename)) {
if (stream->nb_streams != 1) {
@@ -3130,7 +3130,7 @@ static int rtp_new_av_stream(HTTPContext *c,
ctx = av_alloc_format_context();
if (!ctx)
return -1;
ctx->oformat = &rtp_mux;
ctx->oformat = &rtp_muxer;
st = av_mallocz(sizeof(AVStream));
if (!st)
@@ -3350,7 +3350,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_mux) {
if (stream->fmt == &rtp_muxer) {
/* specific case : if transport stream output to RTP,
we use a raw transport stream reader */
stream->ap_in->mpeg2ts_raw = 1;