apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-26 18:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename ffserver to avserver.

Browse Source
This commit is contained in:
Anton Khirnov
2011-07-26 21:56:56 +02:00
parent 9e12f0bf5f
commit 4d58e4cb4c
16 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/ffm.h
View File

@@ -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.

8
libavformat/ffmdec.c
View File

@@ -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,

4
libavformat/ffmenc.c
View File

@@ -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),

2
libavformat/mpjpeg.c
View File

@@ -22,7 +22,7 @@
/* Multipart JPEG */
#define BOUNDARY_TAG "ffserver"
#define BOUNDARY_TAG "avserver"
static int mpjpeg_write_header(AVFormatContext *s)
{