Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
be73d76b
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,发现更多精彩内容 >>
提交
be73d76b
编写于
6月 30, 2011
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cosmetics: fix some then/than typos
上级
d7537a6f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
9 deletion
+9
-9
libavcodec/avcodec.h
libavcodec/avcodec.h
+1
-1
libavcodec/dca.c
libavcodec/dca.c
+1
-1
libavcodec/dsputil.h
libavcodec/dsputil.h
+2
-2
libavcodec/get_bits.h
libavcodec/get_bits.h
+2
-2
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+2
-2
libavcodec/pgssubdec.c
libavcodec/pgssubdec.c
+1
-1
未找到文件。
libavcodec/avcodec.h
浏览文件 @
be73d76b
...
...
@@ -1363,7 +1363,7 @@ typedef struct AVCodecContext {
* A demuxer should set this to what is stored in the field used to identify the codec.
* If there are multiple such fields in a container then the demuxer should choose the one
* which maximizes the information about the used codec.
* If the codec tag field in a container is larger th
e
n 32 bits then the demuxer should
* If the codec tag field in a container is larger th
a
n 32 bits then the demuxer should
* remap the longer ID to 32 bits with a table or other structure. Alternatively a new
* extra_codec_tag + size could be added but for this a clear advantage must be demonstrated
* first.
...
...
libavcodec/dca.c
浏览文件 @
be73d76b
...
...
@@ -1316,7 +1316,7 @@ static int dca_convert_bitstream(const uint8_t * src, int src_size, uint8_t * ds
PutBitContext
pb
;
if
((
unsigned
)
src_size
>
(
unsigned
)
max_size
)
{
// av_log(NULL, AV_LOG_ERROR, "Input frame size larger th
e
n DCA_MAX_FRAME_SIZE!\n");
// av_log(NULL, AV_LOG_ERROR, "Input frame size larger th
a
n DCA_MAX_FRAME_SIZE!\n");
// return -1;
src_size
=
max_size
;
}
...
...
libavcodec/dsputil.h
浏览文件 @
be73d76b
...
...
@@ -150,7 +150,7 @@ void clear_blocks_c(DCTELEM *blocks);
/* add and put pixel (decoding) */
// blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
//h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller th
e
n 4
//h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller th
a
n 4
typedef
void
(
*
op_pixels_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
h
);
typedef
void
(
*
tpel_mc_func
)(
uint8_t
*
block
/*align width (8 or 16)*/
,
const
uint8_t
*
pixels
/*align 1*/
,
int
line_size
,
int
w
,
int
h
);
typedef
void
(
*
qpel_mc_func
)(
uint8_t
*
dst
/*align width (8 or 16)*/
,
uint8_t
*
src
/*align 1*/
,
int
stride
);
...
...
@@ -183,7 +183,7 @@ static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
}
/* motion estimation */
// h is limited to {width/2, width, 2*width} but never larger than 16 and never smaller th
e
n 2
// h is limited to {width/2, width, 2*width} but never larger than 16 and never smaller th
a
n 2
// although currently h<4 is not used as functions with width <8 are neither used nor implemented
typedef
int
(
*
me_cmp_func
)(
void
/*MpegEncContext*/
*
s
,
uint8_t
*
blk1
/*align width (8 or 16)*/
,
uint8_t
*
blk2
/*align 1*/
,
int
line_size
,
int
h
)
/* __attribute__ ((const))*/
;
...
...
libavcodec/get_bits.h
浏览文件 @
be73d76b
...
...
@@ -381,7 +381,7 @@ static inline int check_marker(GetBitContext *s, const char *msg)
/**
* init GetBitContext.
* @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger th
e
n the actual read bits
* @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger th
a
n the actual read bits
* because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
* @param bit_size the size of the buffer in bits
*
...
...
@@ -504,7 +504,7 @@ void free_vlc(VLC *vlc);
/**
* parses a vlc code, faster th
e
n get_vlc()
* parses a vlc code, faster th
a
n get_vlc()
* @param bits is the number of bits which will be read at once, must be
* identical to nb_bits in init_vlc()
* @param max_depth is the number of times bits bits must be read to completely
...
...
libavcodec/mpegvideo_enc.c
浏览文件 @
be73d76b
...
...
@@ -1787,7 +1787,7 @@ static av_always_inline void encode_mb(MpegEncContext *s, int motion_x, int moti
static
inline
void
copy_context_before_encode
(
MpegEncContext
*
d
,
MpegEncContext
*
s
,
int
type
){
int
i
;
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
e
n a loop?
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
a
n a loop?
/* mpeg1 */
d
->
mb_skip_run
=
s
->
mb_skip_run
;
...
...
@@ -1816,7 +1816,7 @@ static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *
int
i
;
memcpy
(
d
->
mv
,
s
->
mv
,
2
*
4
*
2
*
sizeof
(
int
));
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
e
n a loop?
memcpy
(
d
->
last_mv
,
s
->
last_mv
,
2
*
2
*
2
*
sizeof
(
int
));
//FIXME is memcpy faster th
a
n a loop?
/* mpeg1 */
d
->
mb_skip_run
=
s
->
mb_skip_run
;
...
...
libavcodec/pgssubdec.c
浏览文件 @
be73d76b
...
...
@@ -198,7 +198,7 @@ static int parse_picture_segment(AVCodecContext *avctx,
/* Make sure the bitmap is not too large */
if
(
avctx
->
width
<
width
||
avctx
->
height
<
height
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Bitmap dimensions larger th
e
n video.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Bitmap dimensions larger th
a
n video.
\n
"
);
return
-
1
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录