Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
5e534865
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,发现更多精彩内容 >>
提交
5e534865
编写于
2月 13, 2008
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
typo fix: inited --> initialized
Originally committed as revision 11920 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
f1cc49a6
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
47 addition
and
47 deletion
+47
-47
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+3
-3
libavcodec/dca.c
libavcodec/dca.c
+6
-6
libavcodec/error_resilience.c
libavcodec/error_resilience.c
+1
-1
libavcodec/imgconvert.c
libavcodec/imgconvert.c
+3
-3
libavcodec/mpc7.c
libavcodec/mpc7.c
+3
-3
libavcodec/mpc8.c
libavcodec/mpc8.c
+3
-3
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec.c
+1
-1
libavcodec/msmpeg4.c
libavcodec/msmpeg4.c
+3
-3
libavcodec/qdm2.c
libavcodec/qdm2.c
+3
-3
libavcodec/utils.c
libavcodec/utils.c
+3
-3
libavcodec/vc1.c
libavcodec/vc1.c
+4
-4
libavcodec/vp3.c
libavcodec/vp3.c
+5
-5
libavdevice/alldevices.c
libavdevice/alldevices.c
+3
-3
libavformat/allformats.c
libavformat/allformats.c
+3
-3
libavformat/nutdec.c
libavformat/nutdec.c
+3
-3
未找到文件。
libavcodec/allcodecs.c
浏览文件 @
5e534865
...
...
@@ -53,11 +53,11 @@
*/
void
avcodec_register_all
(
void
)
{
static
int
inited
;
static
int
init
ializ
ed
;
if
(
inited
)
if
(
init
ializ
ed
)
return
;
inited
=
1
;
init
ializ
ed
=
1
;
/* video codecs */
REGISTER_DECODER
(
AASC
,
aasc
);
...
...
libavcodec/dca.c
浏览文件 @
5e534865
...
...
@@ -179,10 +179,10 @@ typedef struct {
static
void
dca_init_vlcs
(
void
)
{
static
int
vlcs_inited
=
0
;
static
int
vlcs_init
ializ
ed
=
0
;
int
i
,
j
;
if
(
vlcs_inited
)
if
(
vlcs_init
ializ
ed
)
return
;
dca_bitalloc_index
.
offset
=
1
;
...
...
@@ -214,7 +214,7 @@ static void dca_init_vlcs(void)
bitalloc_bits
[
i
][
j
],
1
,
1
,
bitalloc_codes
[
i
][
j
],
2
,
2
,
1
);
}
vlcs_inited
=
1
;
vlcs_init
ializ
ed
=
1
;
}
static
inline
void
get_array
(
GetBitContext
*
gb
,
int
*
dst
,
int
len
,
int
bits
)
...
...
@@ -1195,9 +1195,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
static
void
pre_calc_cosmod
(
DCAContext
*
s
)
{
int
i
,
j
,
k
;
static
int
cosmod_inited
=
0
;
static
int
cosmod_init
ializ
ed
=
0
;
if
(
cosmod_inited
)
return
;
if
(
cosmod_init
ializ
ed
)
return
;
for
(
j
=
0
,
k
=
0
;
k
<
16
;
k
++
)
for
(
i
=
0
;
i
<
16
;
i
++
)
cos_mod
[
j
++
]
=
cos
((
2
*
i
+
1
)
*
(
2
*
k
+
1
)
*
M_PI
/
64
);
...
...
@@ -1212,7 +1212,7 @@ static void pre_calc_cosmod(DCAContext * s)
for
(
k
=
0
;
k
<
16
;
k
++
)
cos_mod
[
j
++
]
=
-
0
.
25
/
(
2
.
0
*
sin
((
2
*
k
+
1
)
*
M_PI
/
128
));
cosmod_inited
=
1
;
cosmod_init
ializ
ed
=
1
;
}
...
...
libavcodec/error_resilience.c
浏览文件 @
5e534865
...
...
@@ -769,7 +769,7 @@ void ff_er_frame_end(MpegEncContext *s){
if
(
error2
==
(
VP_START
|
DC_ERROR
|
AC_ERROR
|
MV_ERROR
|
AC_END
|
DC_END
|
MV_END
)
&&
error1
!=
(
VP_START
|
DC_ERROR
|
AC_ERROR
|
MV_ERROR
|
AC_END
|
DC_END
|
MV_END
)
&&
((
error1
&
AC_END
)
||
(
error1
&
DC_END
)
||
(
error1
&
MV_END
))){
//end & uninit
ed
&&
((
error1
&
AC_END
)
||
(
error1
&
DC_END
)
||
(
error1
&
MV_END
))){
//end & uninit
end_ok
=
0
;
}
...
...
libavcodec/imgconvert.c
浏览文件 @
5e534865
...
...
@@ -2350,7 +2350,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
const
AVPicture
*
src
,
int
src_pix_fmt
,
int
src_width
,
int
src_height
)
{
static
int
inited
;
static
int
init
ializ
ed
;
int
i
,
ret
,
dst_width
,
dst_height
,
int_pix_fmt
;
const
PixFmtInfo
*
src_pix
,
*
dst_pix
;
const
ConvertEntry
*
ce
;
...
...
@@ -2362,8 +2362,8 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
if
(
src_width
<=
0
||
src_height
<=
0
)
return
0
;
if
(
!
inited
)
{
inited
=
1
;
if
(
!
init
ializ
ed
)
{
init
ializ
ed
=
1
;
img_convert_init
();
}
...
...
libavcodec/mpc7.c
浏览文件 @
5e534865
...
...
@@ -50,7 +50,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
MPCContext
*
c
=
avctx
->
priv_data
;
GetBitContext
gb
;
uint8_t
buf
[
16
];
static
int
vlc_inited
=
0
;
static
int
vlc_init
ializ
ed
=
0
;
if
(
avctx
->
extradata_size
<
16
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"Too small extradata size (%i)!
\n
"
,
avctx
->
extradata_size
);
...
...
@@ -77,7 +77,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
c
->
IS
,
c
->
MSS
,
c
->
gapless
,
c
->
lastframelen
,
c
->
maxbands
);
c
->
frames_to_skip
=
0
;
if
(
vlc_inited
)
return
0
;
if
(
vlc_init
ializ
ed
)
return
0
;
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Initing VLC
\n
"
);
if
(
init_vlc
(
&
scfi_vlc
,
MPC7_SCFI_BITS
,
MPC7_SCFI_SIZE
,
&
mpc7_scfi
[
1
],
2
,
1
,
...
...
@@ -107,7 +107,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
}
}
}
vlc_inited
=
1
;
vlc_init
ializ
ed
=
1
;
return
0
;
}
...
...
libavcodec/mpc8.c
浏览文件 @
5e534865
...
...
@@ -97,7 +97,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
int
i
;
MPCContext
*
c
=
avctx
->
priv_data
;
GetBitContext
gb
;
static
int
vlc_inited
=
0
;
static
int
vlc_init
ializ
ed
=
0
;
if
(
avctx
->
extradata_size
<
2
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"Too small extradata size (%i)!
\n
"
,
avctx
->
extradata_size
);
...
...
@@ -117,7 +117,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
c
->
MSS
=
get_bits1
(
&
gb
);
c
->
frames
=
1
<<
(
get_bits
(
&
gb
,
3
)
*
2
);
if
(
vlc_inited
)
return
0
;
if
(
vlc_init
ializ
ed
)
return
0
;
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Initing VLC
\n
"
);
init_vlc
(
&
band_vlc
,
MPC8_BANDS_BITS
,
MPC8_BANDS_SIZE
,
...
...
@@ -176,7 +176,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
&
mpc8_q8_bits
[
i
],
1
,
1
,
&
mpc8_q8_codes
[
i
],
1
,
1
,
INIT_VLC_USE_STATIC
);
}
vlc_inited
=
1
;
vlc_init
ializ
ed
=
1
;
return
0
;
}
...
...
libavcodec/mpegaudiodec.c
浏览文件 @
5e534865
...
...
@@ -2524,7 +2524,7 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
/* Init the first mp3 decoder in standard way, so that all tables get builded
* We replace avctx->priv_data with the context of the first decoder so that
* decode_init() does not have to be changed.
* Other decoders will be inited here copying data from the first context
* Other decoders will be init
ializ
ed here copying data from the first context
*/
// Allocate zeroed memory for the first decoder context
s
->
mp3decctx
[
0
]
=
av_mallocz
(
sizeof
(
MPADecodeContext
));
...
...
libavcodec/msmpeg4.c
浏览文件 @
5e534865
...
...
@@ -87,7 +87,7 @@ static uint8_t static_rl_table_store[NB_RL_TABLES][2][2*MAX_RUN + MAX_LEVEL + 3]
static
void
common_init
(
MpegEncContext
*
s
)
{
static
int
inited
=
0
;
static
int
init
ializ
ed
=
0
;
switch
(
s
->
msmpeg4_version
){
case
1
:
...
...
@@ -127,8 +127,8 @@ static void common_init(MpegEncContext * s)
}
//Note the default tables are set in common_init in mpegvideo.c
if
(
!
inited
){
inited
=
1
;
if
(
!
init
ializ
ed
){
init
ializ
ed
=
1
;
init_h263_dc_for_msmpeg4
();
}
...
...
libavcodec/qdm2.c
浏览文件 @
5e534865
...
...
@@ -1692,11 +1692,11 @@ static void qdm2_synthesis_filter (QDM2Context *q, int index)
* @param q context
*/
static
void
qdm2_init
(
QDM2Context
*
q
)
{
static
int
inited
=
0
;
static
int
init
ializ
ed
=
0
;
if
(
inited
!=
0
)
if
(
init
ializ
ed
!=
0
)
return
;
inited
=
1
;
init
ializ
ed
=
1
;
qdm2_init_vlc
();
ff_mpa_synth_init
(
mpa_window
);
...
...
libavcodec/utils.c
浏览文件 @
5e534865
...
...
@@ -1254,11 +1254,11 @@ unsigned avcodec_build( void )
void
avcodec_init
(
void
)
{
static
int
inited
=
0
;
static
int
init
ializ
ed
=
0
;
if
(
inited
!=
0
)
if
(
init
ializ
ed
!=
0
)
return
;
inited
=
1
;
init
ializ
ed
=
1
;
dsputil_static_init
();
}
...
...
libavcodec/vc1.c
浏览文件 @
5e534865
...
...
@@ -3867,7 +3867,7 @@ static int vc1_decode_init(AVCodecContext *avctx)
const
uint8_t
*
next
;
int
size
,
buf2_size
;
uint8_t
*
buf2
=
NULL
;
int
seq_init
ed
=
0
,
ep_init
ed
=
0
;
int
seq_init
ialized
=
0
,
ep_initializ
ed
=
0
;
if
(
avctx
->
extradata_size
<
16
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Extradata size too small: %i
\n
"
,
avctx
->
extradata_size
);
...
...
@@ -3889,19 +3889,19 @@ static int vc1_decode_init(AVCodecContext *avctx)
av_free
(
buf2
);
return
-
1
;
}
seq_inited
=
1
;
seq_init
ializ
ed
=
1
;
break
;
case
VC1_CODE_ENTRYPOINT
:
if
(
decode_entry_point
(
avctx
,
&
gb
)
<
0
){
av_free
(
buf2
);
return
-
1
;
}
ep_inited
=
1
;
ep_init
ializ
ed
=
1
;
break
;
}
}
av_free
(
buf2
);
if
(
!
seq_init
ed
||
!
ep_init
ed
){
if
(
!
seq_init
ialized
||
!
ep_initializ
ed
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"Incomplete extradata
\n
"
);
return
-
1
;
}
...
...
libavcodec/vp3.c
浏览文件 @
5e534865
...
...
@@ -273,7 +273,7 @@ typedef struct Vp3DecodeContext {
* which of the fragments are coded */
int
*
coded_fragment_list
;
int
coded_fragment_list_index
;
int
pixel_addresses_inited
;
int
pixel_addresses_init
ializ
ed
;
VLC
dc_vlc
[
16
];
VLC
ac_vlc_1
[
16
];
...
...
@@ -2009,7 +2009,7 @@ static int vp3_decode_init(AVCodecContext *avctx)
s
->
all_fragments
=
av_malloc
(
s
->
fragment_count
*
sizeof
(
Vp3Fragment
));
s
->
coeffs
=
av_malloc
(
s
->
fragment_count
*
sizeof
(
Coeff
)
*
65
);
s
->
coded_fragment_list
=
av_malloc
(
s
->
fragment_count
*
sizeof
(
int
));
s
->
pixel_addresses_inited
=
0
;
s
->
pixel_addresses_init
ializ
ed
=
0
;
if
(
!
s
->
theora_tables
)
{
...
...
@@ -2203,18 +2203,18 @@ static int vp3_decode_frame(AVCodecContext *avctx,
s
->
current_frame
=
s
->
golden_frame
;
/* time to figure out pixel addresses? */
if
(
!
s
->
pixel_addresses_inited
)
if
(
!
s
->
pixel_addresses_init
ializ
ed
)
{
if
(
!
s
->
flipped_image
)
vp3_calculate_pixel_addresses
(
s
);
else
theora_calculate_pixel_addresses
(
s
);
s
->
pixel_addresses_inited
=
1
;
s
->
pixel_addresses_init
ializ
ed
=
1
;
}
}
else
{
/* allocate a new current frame */
s
->
current_frame
.
reference
=
3
;
if
(
!
s
->
pixel_addresses_inited
)
{
if
(
!
s
->
pixel_addresses_init
ializ
ed
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"vp3: first frame not a keyframe
\n
"
);
return
-
1
;
}
...
...
libavdevice/alldevices.c
浏览文件 @
5e534865
...
...
@@ -30,11 +30,11 @@
void
avdevice_register_all
(
void
)
{
static
int
inited
;
static
int
init
ializ
ed
;
if
(
inited
)
if
(
init
ializ
ed
)
return
;
inited
=
1
;
init
ializ
ed
=
1
;
/* devices */
REGISTER_MUXDEMUX
(
AUDIO_BEOS
,
audio_beos
);
...
...
libavformat/allformats.c
浏览文件 @
5e534865
...
...
@@ -40,11 +40,11 @@
*/
void
av_register_all
(
void
)
{
static
int
inited
;
static
int
init
ializ
ed
;
if
(
inited
)
if
(
init
ializ
ed
)
return
;
inited
=
1
;
init
ializ
ed
=
1
;
avcodec_init
();
avcodec_register_all
();
...
...
libavformat/nutdec.c
浏览文件 @
5e534865
...
...
@@ -531,7 +531,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
NUTContext
*
nut
=
s
->
priv_data
;
ByteIOContext
*
bc
=
s
->
pb
;
int64_t
pos
;
int
inited_stream_count
;
int
init
ializ
ed_stream_count
;
nut
->
avf
=
s
;
...
...
@@ -547,14 +547,14 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* stream headers */
pos
=
0
;
for
(
init
ed_stream_count
=
0
;
init
ed_stream_count
<
s
->
nb_streams
;){
for
(
init
ialized_stream_count
=
0
;
initializ
ed_stream_count
<
s
->
nb_streams
;){
pos
=
find_startcode
(
bc
,
STREAM_STARTCODE
,
pos
)
+
1
;
if
(
pos
<
0
+
1
){
av_log
(
s
,
AV_LOG_ERROR
,
"Not all stream headers found.
\n
"
);
return
-
1
;
}
if
(
decode_stream_header
(
nut
)
>=
0
)
inited_stream_count
++
;
init
ializ
ed_stream_count
++
;
}
/* info headers */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录