diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-07-26 21:56:56 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-08-09 19:56:25 +0200 |
commit | 4d58e4cb4ca8e04317fecea432ea3272a445877c (patch) | |
tree | 5993f50a8aa70e6266ad9c8fdc82b1c2eab2a25d /ffmpeg.c | |
parent | 9e12f0bf5f45361a36f9d8c3abca24af55ca740c (diff) | |
download | ffmpeg-4d58e4cb4ca8e04317fecea432ea3272a445877c.tar.gz |
Rename ffserver to avserver.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -691,7 +691,7 @@ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode return ost; } -static int read_ffserver_streams(AVFormatContext *s, const char *filename) +static int read_avserver_streams(AVFormatContext *s, const char *filename) { int i, err; AVFormatContext *ic = NULL; @@ -3766,9 +3766,9 @@ static void opt_output_file(const char *filename) if (!strcmp(file_oformat->name, "ffm") && av_strstart(filename, "http:", NULL)) { - /* special case for files sent to ffserver: we get the stream - parameters from ffserver */ - int err = read_ffserver_streams(oc, filename); + /* special case for files sent to avserver: we get the stream + parameters from avserver */ + int err = read_avserver_streams(oc, filename); if (err < 0) { print_error(filename, err); ffmpeg_exit(1); |