Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
cea96420
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,发现更多精彩内容 >>
提交
cea96420
编写于
2月 19, 2008
作者:
M
Michael Niedermayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ;;
Originally committed as revision 12153 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
a56dcc57
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
12 deletion
+12
-12
ffplay.c
ffplay.c
+1
-1
libavcodec/flac.c
libavcodec/flac.c
+1
-1
libavcodec/g726.c
libavcodec/g726.c
+1
-1
libavcodec/h264.c
libavcodec/h264.c
+3
-3
libavcodec/mpegvideo.c
libavcodec/mpegvideo.c
+3
-3
libavcodec/vp3.c
libavcodec/vp3.c
+1
-1
libavcodec/vqavideo.c
libavcodec/vqavideo.c
+1
-1
libavformat/segafilm.c
libavformat/segafilm.c
+1
-1
未找到文件。
ffplay.c
浏览文件 @
cea96420
...
...
@@ -657,7 +657,7 @@ static void video_image_display(VideoState *is)
aspect_ratio
=
0
;
else
aspect_ratio
=
av_q2d
(
is
->
video_st
->
codec
->
sample_aspect_ratio
)
*
is
->
video_st
->
codec
->
width
/
is
->
video_st
->
codec
->
height
;
;
*
is
->
video_st
->
codec
->
width
/
is
->
video_st
->
codec
->
height
;
if
(
aspect_ratio
<=
0
.
0
)
aspect_ratio
=
(
float
)
is
->
video_st
->
codec
->
width
/
(
float
)
is
->
video_st
->
codec
->
height
;
...
...
libavcodec/flac.c
浏览文件 @
cea96420
...
...
@@ -721,7 +721,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
// s->last_blocksize = s->blocksize;
end:
i
=
(
get_bits_count
(
&
s
->
gb
)
+
7
)
/
8
;
;
i
=
(
get_bits_count
(
&
s
->
gb
)
+
7
)
/
8
;
if
(
i
>
buf_size
){
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"overread: %d
\n
"
,
i
-
buf_size
);
s
->
bitstream_size
=
0
;
...
...
libavcodec/g726.c
浏览文件 @
cea96420
...
...
@@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
mask
=
(
1
<<
c
->
code_size
)
-
1
;
init_get_bits
(
&
gb
,
buf
,
buf_size
*
8
);
if
(
c
->
bits_left
)
{
int
s
=
c
->
code_size
-
c
->
bits_left
;
;
int
s
=
c
->
code_size
-
c
->
bits_left
;
code
=
(
c
->
bit_buffer
<<
s
)
|
get_bits
(
&
gb
,
s
);
*
samples
++
=
g726_decode
(
&
c
->
c
,
code
&
mask
);
}
...
...
libavcodec/h264.c
浏览文件 @
cea96420
...
...
@@ -2919,7 +2919,7 @@ static int fill_default_ref_list(H264Context *h){
if
(
sel
!=
PICT_FRAME
)
continue
;
frame_list
[
list
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
list
][
index
++
].
pic_id
=
i
;
;
frame_list
[
list
][
index
++
].
pic_id
=
i
;
}
len
[
list
]
=
index
;
}
...
...
@@ -2963,7 +2963,7 @@ static int fill_default_ref_list(H264Context *h){
sel
=
h
->
long_ref
[
i
]
->
reference
|
structure_sel
;
if
(
sel
!=
PICT_FRAME
)
continue
;
frame_list
[
0
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
0
][
index
++
].
pic_id
=
i
;
;
frame_list
[
0
][
index
++
].
pic_id
=
i
;
}
if
(
FIELD_PICTURE
)
...
...
@@ -5498,7 +5498,7 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
if
(
!
qmul
)
{
block
[
j
]
=
get_cabac_bypass_sign
(
CC
,
-
1
);
}
else
{
block
[
j
]
=
(
get_cabac_bypass_sign
(
CC
,
-
qmul
[
j
])
+
32
)
>>
6
;
;
block
[
j
]
=
(
get_cabac_bypass_sign
(
CC
,
-
qmul
[
j
])
+
32
)
>>
6
;
}
abslevel1
++
;
...
...
libavcodec/mpegvideo.c
浏览文件 @
cea96420
...
...
@@ -1097,8 +1097,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
for
(
y
=
0
;
y
<=
ey
;
y
++
){
x
=
(
y
*
f
)
>>
16
;
fr
=
(
y
*
f
)
&
0xFFFF
;
buf
[
y
*
stride
+
x
]
+=
(
color
*
(
0x10000
-
fr
))
>>
16
;
;
buf
[
y
*
stride
+
x
+
1
]
+=
(
color
*
fr
)
>>
16
;
;
buf
[
y
*
stride
+
x
]
+=
(
color
*
(
0x10000
-
fr
))
>>
16
;
buf
[
y
*
stride
+
x
+
1
]
+=
(
color
*
fr
)
>>
16
;
}
}
}
...
...
@@ -2129,7 +2129,7 @@ void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
offset
[
2
]
=
offset
[
3
]
=
0
;
}
else
{
offset
[
0
]
=
y
*
s
->
linesize
;
;
offset
[
0
]
=
y
*
s
->
linesize
;
offset
[
1
]
=
offset
[
2
]
=
(
y
>>
s
->
chroma_y_shift
)
*
s
->
uvlinesize
;
offset
[
3
]
=
0
;
...
...
libavcodec/vp3.c
浏览文件 @
cea96420
...
...
@@ -473,7 +473,7 @@ static int init_block_mapping(Vp3DecodeContext *s)
current_width
=
-
1
;
current_height
=
0
;
superblock_row_inc
=
s
->
macroblock_width
-
(
s
->
y_superblock_width
*
2
-
s
->
macroblock_width
);
;
(
s
->
y_superblock_width
*
2
-
s
->
macroblock_width
);
hilbert
=
hilbert_walk_mb
;
mapping_index
=
0
;
current_macroblock
=
-
1
;
...
...
libavcodec/vqavideo.c
浏览文件 @
cea96420
...
...
@@ -133,7 +133,7 @@ static int vqa_decode_init(AVCodecContext *avctx)
{
VqaContext
*
s
=
avctx
->
priv_data
;
unsigned
char
*
vqa_header
;
int
i
,
j
,
codebook_index
;
;
int
i
,
j
,
codebook_index
;
s
->
avctx
=
avctx
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
...
...
libavformat/segafilm.c
浏览文件 @
cea96420
...
...
@@ -107,7 +107,7 @@ static int film_read_header(AVFormatContext *s,
/* normal Saturn .cpk files; 32-byte header */
if
(
get_buffer
(
pb
,
scratch
,
32
)
!=
32
)
return
AVERROR
(
EIO
);
film
->
audio_samplerate
=
AV_RB16
(
&
scratch
[
24
]);
;
film
->
audio_samplerate
=
AV_RB16
(
&
scratch
[
24
]);
film
->
audio_channels
=
scratch
[
21
];
film
->
audio_bits
=
scratch
[
22
];
if
(
film
->
audio_bits
==
8
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录