Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
a5f88736
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,发现更多精彩内容 >>
提交
a5f88736
编写于
8月 21, 2012
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
silly typo fixes
上级
4a7af92c
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
21 addition
and
20 deletion
+21
-20
doc/protocols.texi
doc/protocols.texi
+1
-1
libavcodec/aacpsy.c
libavcodec/aacpsy.c
+2
-1
libavcodec/flac_parser.c
libavcodec/flac_parser.c
+1
-1
libavcodec/flacenc.c
libavcodec/flacenc.c
+1
-1
libavcodec/flicvideo.c
libavcodec/flicvideo.c
+1
-1
libavcodec/wmavoice.c
libavcodec/wmavoice.c
+1
-1
libavcodec/x86/fpel_mmx.c
libavcodec/x86/fpel_mmx.c
+1
-1
libavdevice/v4l2.c
libavdevice/v4l2.c
+1
-1
libavformat/avformat.h
libavformat/avformat.h
+3
-3
libavformat/idcin.c
libavformat/idcin.c
+1
-1
libavformat/pmpdec.c
libavformat/pmpdec.c
+1
-1
libavformat/utils.c
libavformat/utils.c
+3
-3
libavformat/wavdec.c
libavformat/wavdec.c
+3
-3
tools/patcheck
tools/patcheck
+1
-1
未找到文件。
doc/protocols.texi
浏览文件 @
a5f88736
...
...
@@ -564,7 +564,7 @@ The required syntax for a UDP url is:
udp://@var{hostname}:@var{port}[?@var{options}]
@end example
@var{options} contains a list of &-sep
e
rated options of the form @var{key}=@var{val}.
@var{options} contains a list of &-sep
a
rated options of the form @var{key}=@var{val}.
Follow the list of supported options.
@table @option
...
...
libavcodec/aacpsy.c
浏览文件 @
a5f88736
...
...
@@ -804,7 +804,8 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
sum1
+=
psy_fir_coeffs
[
j
]
*
(
firbuf
[
i
+
j
]
+
firbuf
[
i
+
PSY_LAME_FIR_LEN
-
j
]);
sum2
+=
psy_fir_coeffs
[
j
+
1
]
*
(
firbuf
[
i
+
j
+
1
]
+
firbuf
[
i
+
PSY_LAME_FIR_LEN
-
j
-
1
]);
}
/* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768. Tuning this for normalized floats would be difficult. */
/* NOTE: The LAME psymodel expects its input in the range -32768 to
* 32768. Tuning this for normalized floats would be difficult. */
hpfsmpl
[
i
]
=
(
sum1
+
sum2
)
*
32768
.
0
f
;
}
...
...
libavcodec/flac_parser.c
浏览文件 @
a5f88736
...
...
@@ -27,7 +27,7 @@
* Each time it finds and verifies a CRC-8 header it sees which of the
* FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer
* that ends at the newly found header.
* Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of it
'
s crc-verified
* Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of its crc-verified
* children, penalized by changes in sample rate, frame number, etc.
* The parser returns the frame with the highest score.
**/
...
...
libavcodec/flacenc.c
浏览文件 @
a5f88736
...
...
@@ -1232,7 +1232,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
frame_bytes
=
encode_frame
(
s
);
/*
fallback to
verbatim mode if the compressed frame is larger than it
/*
Fall back on
verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */
if
(
frame_bytes
<
0
||
frame_bytes
>
s
->
max_framesize
)
{
s
->
frame
.
verbatim_only
=
1
;
...
...
libavcodec/flicvideo.c
浏览文件 @
a5f88736
...
...
@@ -539,7 +539,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
break
;
case
FLI_LC
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unexpected FLI_LC chunk in non-palet
is
ed FLC
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unexpected FLI_LC chunk in non-palet
tiz
ed FLC
\n
"
);
bytestream2_skip
(
&
g2
,
chunk_size
-
6
);
break
;
...
...
libavcodec/wmavoice.c
浏览文件 @
a5f88736
...
...
@@ -607,7 +607,7 @@ static void calc_input_response(WMAVoiceContext *s, float *lpcs,
/* 70.57 =~ 1/log10(1.0331663) */
idx
=
(
pwr
*
gain_mul
-
0
.
02
95
)
*
70
.
570526123
;
if
(
idx
>
127
)
{
// fallback if index falls outside table range
if
(
idx
>
127
)
{
// fall
back if index falls outside table range
coeffs
[
n
]
=
wmavoice_energy_table
[
127
]
*
powf
(
1
.
0331663
,
idx
-
127
);
}
else
...
...
libavcodec/x86/fpel_mmx.c
浏览文件 @
a5f88736
...
...
@@ -29,7 +29,7 @@
#if HAVE_MMX_INLINE
// in case more speed is needed - unroling would certainly help
// in case more speed is needed - unrol
l
ing would certainly help
void
ff_avg_pixels8_mmx
(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
...
...
libavdevice/v4l2.c
浏览文件 @
a5f88736
...
...
@@ -485,7 +485,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
/* Image is at s->buff_start[buf.index] */
if
(
avpriv_atomic_int_get
(
&
s
->
buffers_queued
)
==
FFMAX
(
s
->
buffers
/
8
,
1
))
{
/* when we start getting low on queued buffers, fall
back to
copying data */
/* when we start getting low on queued buffers, fall
back on
copying data */
res
=
av_new_packet
(
pkt
,
buf
.
bytesused
);
if
(
res
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Error allocating a packet.
\n
"
);
...
...
libavformat/avformat.h
浏览文件 @
a5f88736
...
...
@@ -353,8 +353,8 @@ typedef struct AVProbeData {
#define AVFMT_VARIABLE_FPS 0x0400
/**< Format allows variable fps. */
#define AVFMT_NODIMENSIONS 0x0800
/**< Format does not need width/height */
#define AVFMT_NOSTREAMS 0x1000
/**< Format does not require any streams */
#define AVFMT_NOBINSEARCH 0x2000
/**< Format does not allow to fall
back to
binary search via read_timestamp */
#define AVFMT_NOGENSEARCH 0x4000
/**< Format does not allow to fall
back to
generic search */
#define AVFMT_NOBINSEARCH 0x2000
/**< Format does not allow to fall
back on
binary search via read_timestamp */
#define AVFMT_NOGENSEARCH 0x4000
/**< Format does not allow to fall
back on
generic search */
#define AVFMT_NO_BYTE_SEEK 0x8000
/**< Format does not allow seeking by bytes */
#define AVFMT_ALLOW_FLUSH 0x10000
/**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
#define AVFMT_TS_NONSTRICT 0x20000
/**< Format does not require strictly
...
...
@@ -1388,7 +1388,7 @@ void avformat_close_input(AVFormatContext **s);
*
* @param s Media file handle, must be allocated with avformat_alloc_context().
* Its oformat field must be set to the desired output format;
* Its pb field must be set to an already opene
ne
d AVIOContext.
* Its pb field must be set to an already opened AVIOContext.
* @param options An AVDictionary filled with AVFormatContext and muxer-private options.
* On return this parameter will be destroyed and replaced with a dict containing
* options that were not found. May be NULL.
...
...
libavformat/idcin.c
浏览文件 @
a5f88736
...
...
@@ -136,7 +136,7 @@ static int idcin_probe(AVProbeData *p)
if
(
number
>
2
)
return
0
;
/* return half certain
l
y since this check is a bit sketchy */
/* return half certain
t
y since this check is a bit sketchy */
return
AVPROBE_SCORE_MAX
/
2
;
}
...
...
libavformat/pmpdec.c
浏览文件 @
a5f88736
...
...
@@ -157,7 +157,7 @@ static int pmp_seek(AVFormatContext *s, int stream_idx, int64_t ts, int flags)
{
PMPContext
*
pmp
=
s
->
priv_data
;
pmp
->
cur_stream
=
0
;
// fall
back to
default seek now
// fall
back on
default seek now
return
-
1
;
}
...
...
libavformat/utils.c
浏览文件 @
a5f88736
...
...
@@ -722,7 +722,7 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
if
((
frame_size
=
av_get_audio_frame_duration
(
enc
,
size
))
>
0
)
return
frame_size
;
/*
fallback to using frame_size if muxing
*/
/*
Fall back on using frame_size if muxing.
*/
if
(
enc
->
frame_size
>
1
)
return
enc
->
frame_size
;
...
...
@@ -1790,8 +1790,8 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
//try to seek via read_timestamp()
}
//
Fallback to old API if new is not implemented but old is
//
Note the old has somewat different sematics
//
Fall back on old API if new is not implemented but old is.
//
Note the old API has somewhat different semantics.
if
(
s
->
iformat
->
read_seek
||
1
)
return
av_seek_frame
(
s
,
stream_index
,
ts
,
flags
|
((
uint64_t
)
ts
-
min_ts
>
(
uint64_t
)
max_ts
-
ts
?
AVSEEK_FLAG_BACKWARD
:
0
));
...
...
libavformat/wavdec.c
浏览文件 @
a5f88736
...
...
@@ -73,9 +73,9 @@ static int wav_probe(AVProbeData *p)
return
0
;
if
(
!
memcmp
(
p
->
buf
+
8
,
"WAVE"
,
4
))
{
if
(
!
memcmp
(
p
->
buf
,
"RIFF"
,
4
))
/* Since
ACT demuxer has standard WAV header at top of it's
*
own, returning score is decreased to avoid probe conflict
* between ACT and WAV. */
/* Since
the ACT demuxer has a standard WAV header at the top of
*
its own, the returned score is decreased to avoid a probe
*
conflict
between ACT and WAV. */
return
AVPROBE_SCORE_MAX
-
1
;
else
if
(
!
memcmp
(
p
->
buf
,
"RF64"
,
4
)
&&
!
memcmp
(
p
->
buf
+
12
,
"ds64"
,
4
))
...
...
tools/patcheck
浏览文件 @
a5f88736
...
...
@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^
cat
$TMP
hiegrep
'# *ifdef * (HAVE|CONFIG)_'
'ifdefs that should be #if'
$*
hiegrep
'\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b'
'common typos'
$*
hiegrep
'\b(awnser|cant|dont|wont|
doesnt|
usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b'
'common typos'
$*
hiegrep
'av_log\( *NULL'
'Missing context in av_log'
$*
hiegrep
'[^sn]printf'
'Please use av_log'
$*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录