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 /libavformat | |
| parent | 9e12f0bf5f45361a36f9d8c3abca24af55ca740c (diff) | |
| download | ffmpeg-4d58e4cb4ca8e04317fecea432ea3272a445877c.tar.gz | |
Rename ffserver to avserver.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/ffm.h | 2 | ||||
| -rw-r--r-- | libavformat/ffmdec.c | 8 | ||||
| -rw-r--r-- | libavformat/ffmenc.c | 4 | ||||
| -rw-r--r-- | libavformat/mpjpeg.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/ffm.h b/libavformat/ffm.h index 89a14a5a88..6ce5e0408c 100644 --- a/libavformat/ffm.h +++ b/libavformat/ffm.h @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) common header + * FFM (avserver live feed) common header * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 9168ac57e8..07f790773c 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) demuxer + * FFM (avserver live feed) demuxer * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. @@ -23,7 +23,7 @@ #include "libavutil/intfloat_readwrite.h" #include "avformat.h" #include "ffm.h" -#if CONFIG_FFSERVER +#if CONFIG_AVSERVER #include <unistd.h> int64_t ffm_read_write_index(int fd) @@ -55,7 +55,7 @@ void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size) ffm->write_index = pos; ffm->file_size = file_size; } -#endif // CONFIG_FFSERVER +#endif // CONFIG_AVSERVER static int ffm_is_avail_data(AVFormatContext *s, int size) { @@ -510,7 +510,7 @@ static int ffm_probe(AVProbeData *p) AVInputFormat ff_ffm_demuxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), .priv_data_size = sizeof(FFMContext), .read_probe = ffm_probe, .read_header = ffm_read_header, diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 87a477fcbb..07876ccd4b 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -1,5 +1,5 @@ /* - * FFM (ffserver live feed) muxer + * FFM (avserver live feed) muxer * Copyright (c) 2001 Fabrice Bellard * * This file is part of Libav. @@ -242,7 +242,7 @@ static int ffm_write_trailer(AVFormatContext *s) AVOutputFormat ff_ffm_muxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), .mime_type = "", .extensions = "ffm", .priv_data_size = sizeof(FFMContext), diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 6580904d7e..79cc272e27 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -22,7 +22,7 @@ /* Multipart JPEG */ -#define BOUNDARY_TAG "ffserver" +#define BOUNDARY_TAG "avserver" static int mpjpeg_write_header(AVFormatContext *s) { |