Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
58f26ba9
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,发现更多精彩内容 >>
提交
58f26ba9
编写于
8月 15, 2001
作者:
F
Fabrice Bellard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
changed opendivx to mpeg4
Originally committed as revision 102 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
935442b5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
14 deletion
+15
-14
libav/avienc.c
libav/avienc.c
+3
-3
libavcodec/apiexample.c
libavcodec/apiexample.c
+4
-4
libavcodec/mpegvideo.c
libavcodec/mpegvideo.c
+4
-4
libavcodec/mpegvideo.h
libavcodec/mpegvideo.h
+2
-1
libavcodec/utils.c
libavcodec/utils.c
+2
-2
未找到文件。
libav/avienc.c
浏览文件 @
58f26ba9
...
...
@@ -58,9 +58,9 @@ CodecTag codec_bmp_tags[] = {
{
CODEC_ID_H263
,
MKTAG
(
'U'
,
'2'
,
'6'
,
'3'
)
},
{
CODEC_ID_H263I
,
MKTAG
(
'I'
,
'2'
,
'6'
,
'3'
)
},
/* intel h263 */
{
CODEC_ID_MJPEG
,
MKTAG
(
'M'
,
'J'
,
'P'
,
'G'
)
},
{
CODEC_ID_
OPENDIVX
,
MKTAG
(
'D'
,
'I'
,
'V'
,
'X'
)
},
{
CODEC_ID_
OPENDIVX
,
MKTAG
(
'd'
,
'i'
,
'v'
,
'x'
)
},
{
CODEC_ID_
OPENDIVX
,
MKTAG
(
0x04
,
0
,
0
,
0
)
},
/* some broken avi use this */
{
CODEC_ID_
MPEG4
,
MKTAG
(
'D'
,
'I'
,
'V'
,
'X'
)
},
{
CODEC_ID_
MPEG4
,
MKTAG
(
'd'
,
'i'
,
'v'
,
'x'
)
},
{
CODEC_ID_
MPEG4
,
MKTAG
(
0x04
,
0
,
0
,
0
)
},
/* some broken avi use this */
{
CODEC_ID_MSMPEG4
,
MKTAG
(
'D'
,
'I'
,
'V'
,
'3'
)
},
/* default signature when using MSMPEG4 */
{
CODEC_ID_MSMPEG4
,
MKTAG
(
'M'
,
'P'
,
'4'
,
'3'
)
},
{
0
,
0
},
...
...
libavcodec/apiexample.c
浏览文件 @
58f26ba9
...
...
@@ -292,7 +292,7 @@ void video_decode_example(const char *outfilename, const char *filename)
/* put default values */
memset
(
c
,
0
,
sizeof
(
*
c
));
/* for some codecs, such as msmpeg4 and
opendivx
, width and height
/* for some codecs, such as msmpeg4 and
mpeg4
, width and height
MUST be initialized there because these info are not available
in the bitstream */
...
...
@@ -320,9 +320,9 @@ void video_decode_example(const char *outfilename, const char *filename)
and this is the only method to use them because you cannot
know the compressed data size before analysing it.
BUT some other codecs (msmpeg4,
opendivx) are inherently
frame based, so you must call them with all the data for
one
frame exactly. You must also initialize 'width' and
BUT some other codecs (msmpeg4,
mpeg4) are inherently frame
based, so you must call them with all the data for one
frame exactly. You must also initialize 'width' and
'height' before initializing them. */
/* NOTE2: some codecs allow the raw parameters (frame size,
...
...
libavcodec/mpegvideo.c
浏览文件 @
58f26ba9
...
...
@@ -283,7 +283,7 @@ int MPV_encode_init(AVCodecContext *avctx)
s
->
out_format
=
FMT_H263
;
s
->
h263_rv10
=
1
;
break
;
case
CODEC_ID_
OPENDIVX
:
case
CODEC_ID_
MPEG4
:
s
->
out_format
=
FMT_H263
;
s
->
h263_pred
=
1
;
s
->
unrestricted_mv
=
1
;
...
...
@@ -1341,10 +1341,10 @@ AVCodec mjpeg_encoder = {
MPV_encode_end
,
};
AVCodec
opendivx
_encoder
=
{
"
opendivx
"
,
AVCodec
mpeg4
_encoder
=
{
"
mpeg4
"
,
CODEC_TYPE_VIDEO
,
CODEC_ID_
OPENDIVX
,
CODEC_ID_
MPEG4
,
sizeof
(
MpegEncContext
),
MPV_encode_init
,
MPV_encode_picture
,
...
...
libavcodec/mpegvideo.h
浏览文件 @
58f26ba9
...
...
@@ -31,6 +31,7 @@ enum OutputFormat {
#define MPEG_BUF_SIZE (16 * 1024)
typedef
struct
MpegEncContext
{
struct
AVCodecContext
*
avctx
;
/* the following parameters must be initialized before encoding */
int
width
,
height
;
/* picture size. must be a multiple of 16 */
int
gop_size
;
...
...
@@ -40,7 +41,7 @@ typedef struct MpegEncContext {
enum
OutputFormat
out_format
;
/* output format */
int
h263_plus
;
/* h263 plus headers */
int
h263_rv10
;
/* use RV10 variation for H263 */
int
h263_pred
;
/* use
OpenDIVX (aka mpeg4)
ac/dc predictions */
int
h263_pred
;
/* use
mpeg4/h263
ac/dc predictions */
int
h263_msmpeg4
;
/* generate MSMPEG4 compatible stream */
int
h263_intel
;
/* use I263 intel h263 header */
int
fixed_qscale
;
/* fixed qscale if non zero */
...
...
libavcodec/utils.c
浏览文件 @
58f26ba9
...
...
@@ -350,7 +350,7 @@ void avcodec_register_all(void)
register_avcodec
(
&
h263p_encoder
);
register_avcodec
(
&
rv10_encoder
);
register_avcodec
(
&
mjpeg_encoder
);
register_avcodec
(
&
opendivx
_encoder
);
register_avcodec
(
&
mpeg4
_encoder
);
register_avcodec
(
&
msmpeg4_encoder
);
#endif
/* CONFIG_ENCODERS */
register_avcodec
(
&
pcm_codec
);
...
...
@@ -359,7 +359,7 @@ void avcodec_register_all(void)
/* decoders */
#ifdef CONFIG_DECODERS
register_avcodec
(
&
h263_decoder
);
register_avcodec
(
&
opendivx
_decoder
);
register_avcodec
(
&
mpeg4
_decoder
);
register_avcodec
(
&
msmpeg4_decoder
);
register_avcodec
(
&
mpeg_decoder
);
register_avcodec
(
&
h263i_decoder
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录