Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8bfb108b
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8bfb108b
编写于
12月 21, 2007
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
comment typo fixes
Originally committed as revision 11294 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
56b69633
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
36 addition
and
36 deletion
+36
-36
ffserver.c
ffserver.c
+2
-2
libavcodec/avcodec.h
libavcodec/avcodec.h
+4
-4
libavcodec/imgresample.c
libavcodec/imgresample.c
+1
-1
libavformat/avformat.h
libavformat/avformat.h
+20
-21
libavformat/avio.h
libavformat/avio.h
+9
-8
未找到文件。
ffserver.c
浏览文件 @
8bfb108b
...
...
@@ -234,14 +234,14 @@ typedef struct FFStream {
int
conns_served
;
int64_t
bytes_served
;
int64_t
feed_max_size
;
/* maximum storage size, zero means unlimited */
int64_t
feed_write_index
;
/* current write position in feed (it wraps round) */
int64_t
feed_write_index
;
/* current write position in feed (it wraps
a
round) */
int64_t
feed_size
;
/* current size of feed */
struct
FFStream
*
next_feed
;
}
FFStream
;
typedef
struct
FeedData
{
long
long
data_count
;
float
avg_frame_size
;
/* frame size aver
r
aged over last frames with exponential mean */
float
avg_frame_size
;
/* frame size averaged over last frames with exponential mean */
}
FeedData
;
static
struct
sockaddr_in
my_http_addr
;
...
...
libavcodec/avcodec.h
浏览文件 @
8bfb108b
...
...
@@ -747,10 +747,10 @@ typedef struct AVPanScan{
* Audio Video Frame.
* New fields can be added to the end of FF_COMMON_FRAME with minor version
* bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump. No fields should be added into AVFrame before or after
* FF_COMMON_FRAME!
* sizeof(AVFrame) must not be used outside libav*
* sizeof(AVFrame) must not be used outside libav*
.
*/
typedef
struct
AVFrame
{
FF_COMMON_FRAME
...
...
@@ -761,9 +761,9 @@ typedef struct AVFrame {
/**
* main external API structure.
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(AVCodecContext) must not be used outside libav*
* sizeof(AVCodecContext) must not be used outside libav*
.
*/
typedef
struct
AVCodecContext
{
/**
...
...
libavcodec/imgresample.c
浏览文件 @
8bfb108b
...
...
@@ -391,7 +391,7 @@ static void component_resample(ImgReSampleContext *s,
h_resample
(
new_line
,
owidth
,
src_line
,
iwidth
,
-
FCENTER
*
POS_FRAC
,
s
->
h_incr
,
&
s
->
h_filters
[
0
][
0
]);
/* handle ring buffer wraping */
/* handle ring buffer wrap
p
ing */
if
(
ring_y
>=
LINE_BUF_HEIGHT
)
{
memcpy
(
s
->
line_buf
+
(
ring_y
-
LINE_BUF_HEIGHT
)
*
owidth
,
new_line
,
owidth
);
...
...
libavformat/avformat.h
浏览文件 @
8bfb108b
...
...
@@ -272,21 +272,21 @@ typedef struct AVIndexEntry {
/**
* Stream structure.
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(AVStream) must not be used outside libav*
* sizeof(AVStream) must not be used outside libav*
.
*/
typedef
struct
AVStream
{
int
index
;
/**< stream index in AVFormatContext */
int
id
;
/**< format specific stream id */
AVCodecContext
*
codec
;
/**< codec context */
/**
*
r
eal base frame rate of the stream.
*
this is the lowest frame
rate with which all timestamps can be
*
R
eal base frame rate of the stream.
*
This is the lowest frame
rate with which all timestamps can be
* represented accurately (it is the least common multiple of all
* framerates in the stream), Note, this value is just a guess!
*
f
or example if the timebase is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1
* frame
rates in the stream), Note, this value is just a guess!
*
F
or example if the timebase is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks then r_frame_rate will be 50/1
.
*/
AVRational
r_frame_rate
;
void
*
priv_data
;
...
...
@@ -297,9 +297,9 @@ typedef struct AVStream {
struct
AVFrac
pts
;
/**
*
t
his is the fundamental unit of time (in seconds) in terms
* of which frame timestamps are represented.
f
or fixed-fps content,
* timebase should be 1/framerate and timestamp increments should be
*
T
his is the fundamental unit of time (in seconds) in terms
* of which frame timestamps are represented.
F
or fixed-fps content,
* timebase should be 1/frame
rate and timestamp increments should be
* identically 1.
*/
AVRational
time_base
;
...
...
@@ -312,16 +312,16 @@ typedef struct AVStream {
* MN: dunno if that is the right place for it */
float
quality
;
/**
*
d
ecoding: pts of the first frame of the stream, in stream time base.
*
o
nly set this if you are absolutely 100% sure that the value you set
* it to really is the pts of the first frame
*
D
ecoding: pts of the first frame of the stream, in stream time base.
*
O
nly set this if you are absolutely 100% sure that the value you set
* it to really is the pts of the first frame
.
* This may be undefined (AV_NOPTS_VALUE).
* @note
t
he ASF header does NOT contain a correct start_time the ASF
* demuxer must NOT set this
* @note
T
he ASF header does NOT contain a correct start_time the ASF
* demuxer must NOT set this
.
*/
int64_t
start_time
;
/**
*
d
ecoding: duration of the stream, in stream time base.
*
D
ecoding: duration of the stream, in stream time base.
* If a source file does not specify a duration, but does specify
* a bitrate, this value will be estimates from bit rate and file size.
*/
...
...
@@ -351,11 +351,10 @@ typedef struct AVStream {
#define AV_PROGRAM_RUNNING 1
/**
*
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(AVProgram) must not be used outside libav*
* sizeof(AVProgram) must not be used outside libav*
.
*/
typedef
struct
AVProgram
{
int
id
;
...
...
@@ -375,9 +374,9 @@ typedef struct AVProgram {
/**
* format I/O context.
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(AVFormatContext) must not be used outside libav*
* sizeof(AVFormatContext) must not be used outside libav*
.
*/
typedef
struct
AVFormatContext
{
const
AVClass
*
av_class
;
/**< set by av_alloc_format_context */
...
...
libavformat/avio.h
浏览文件 @
8bfb108b
...
...
@@ -32,9 +32,9 @@ typedef int64_t offset_t;
/**
* URL Context.
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(URLContext) must not be used outside libav*
* sizeof(URLContext) must not be used outside libav*
.
*/
struct
URLContext
{
struct
URLProtocol
*
prot
;
...
...
@@ -69,7 +69,7 @@ offset_t url_filesize(URLContext *h);
/**
* Return the maximum packet size associated to packetized file
* handle. If the file is not packetized (stream like
http
or file on
* handle. If the file is not packetized (stream like
HTTP
or file on
* disk), then 0 is returned.
*
* @param h file handle
...
...
@@ -79,10 +79,10 @@ int url_get_max_packet_size(URLContext *h);
void
url_get_filename
(
URLContext
*
h
,
char
*
buf
,
int
buf_size
);
/**
*
t
he callback is called in blocking functions to test regulary if
*
T
he callback is called in blocking functions to test regulary if
* asynchronous interruption is needed. AVERROR(EINTR) is returned
* in this case by the interrupted function. 'NULL' means no interrupt
* callback is given.
i
* callback is given.
*/
void
url_set_interrupt_cb
(
URLInterruptCB
*
interrupt_cb
);
...
...
@@ -95,9 +95,10 @@ int url_poll(URLPollEntry *poll_table, int n, int timeout);
* @param pause 1 for pause, 0 for resume
*/
int
av_url_read_pause
(
URLContext
*
h
,
int
pause
);
/**
* Seek to a given timestamp relative to some component stream.
* Only meaningful if using a network streaming protocol (e.g. MMS.)
* Only meaningful if using a network streaming protocol (e.g. MMS.)
.
* @param stream_index The stream index that the timestamp is relative to.
* If stream_index is (-1) the timestamp should be in AV_TIME_BASE
* units from the beginning of the presentation.
...
...
@@ -145,9 +146,9 @@ int register_protocol(URLProtocol *protocol);
/**
* Bytestream IO Context.
* New fields can be added to the end with minor version bumps.
* Removal, reordering and changes to existing fields require a
M
ajor
* Removal, reordering and changes to existing fields require a
m
ajor
* version bump.
* sizeof(ByteIOContext) must not be used outside libav*
* sizeof(ByteIOContext) must not be used outside libav*
.
*/
typedef
struct
{
unsigned
char
*
buffer
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录