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/ffmenc.c | |
| parent | 9e12f0bf5f45361a36f9d8c3abca24af55ca740c (diff) | |
Rename ffserver to avserver.
Diffstat (limited to 'libavformat/ffmenc.c')
| -rw-r--r-- | libavformat/ffmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
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), |