Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8c51620f
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,发现更多精彩内容 >>
提交
8c51620f
编写于
5月 24, 2011
作者:
A
Alex Converse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove h263_msmpeg4 from MpegEncContext.
It was long ago superseded by msmpeg4_version.
上级
19a686b8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
16 deletion
+4
-16
libavcodec/h263dec.c
libavcodec/h263dec.c
+1
-7
libavcodec/mpegvideo.c
libavcodec/mpegvideo.c
+1
-1
libavcodec/mpegvideo.h
libavcodec/mpegvideo.h
+0
-2
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+2
-6
未找到文件。
libavcodec/h263dec.c
浏览文件 @
8c51620f
...
@@ -69,33 +69,27 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
...
@@ -69,33 +69,27 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
case
CODEC_ID_MPEG4
:
case
CODEC_ID_MPEG4
:
break
;
break
;
case
CODEC_ID_MSMPEG4V1
:
case
CODEC_ID_MSMPEG4V1
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
1
;
s
->
msmpeg4_version
=
1
;
break
;
break
;
case
CODEC_ID_MSMPEG4V2
:
case
CODEC_ID_MSMPEG4V2
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
2
;
s
->
msmpeg4_version
=
2
;
break
;
break
;
case
CODEC_ID_MSMPEG4V3
:
case
CODEC_ID_MSMPEG4V3
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
3
;
s
->
msmpeg4_version
=
3
;
break
;
break
;
case
CODEC_ID_WMV1
:
case
CODEC_ID_WMV1
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
4
;
s
->
msmpeg4_version
=
4
;
break
;
break
;
case
CODEC_ID_WMV2
:
case
CODEC_ID_WMV2
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
5
;
s
->
msmpeg4_version
=
5
;
break
;
break
;
case
CODEC_ID_VC1
:
case
CODEC_ID_VC1
:
case
CODEC_ID_WMV3
:
case
CODEC_ID_WMV3
:
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
msmpeg4_version
=
6
;
s
->
msmpeg4_version
=
6
;
avctx
->
chroma_sample_location
=
AVCHROMA_LOC_LEFT
;
avctx
->
chroma_sample_location
=
AVCHROMA_LOC_LEFT
;
...
@@ -655,7 +649,7 @@ retry:
...
@@ -655,7 +649,7 @@ retry:
decode_slice
(
s
);
decode_slice
(
s
);
}
}
if
(
s
->
h263_msmpeg4
&&
s
->
msmpeg4_version
<
4
&&
s
->
pict_type
==
AV_PICTURE_TYPE_I
)
if
(
s
->
msmpeg4_version
&&
s
->
msmpeg4_version
<
4
&&
s
->
pict_type
==
AV_PICTURE_TYPE_I
)
if
(
!
CONFIG_MSMPEG4_DECODER
||
msmpeg4_decode_ext_header
(
s
,
buf_size
)
<
0
){
if
(
!
CONFIG_MSMPEG4_DECODER
||
msmpeg4_decode_ext_header
(
s
,
buf_size
)
<
0
){
s
->
error_status_table
[
s
->
mb_num
-
1
]
=
AC_ERROR
|
DC_ERROR
|
MV_ERROR
;
s
->
error_status_table
[
s
->
mb_num
-
1
]
=
AC_ERROR
|
DC_ERROR
|
MV_ERROR
;
}
}
...
...
libavcodec/mpegvideo.c
浏览文件 @
8c51620f
...
@@ -1986,7 +1986,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
...
@@ -1986,7 +1986,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
}
}
/* add dct residue */
/* add dct residue */
if
(
s
->
encoding
||
!
(
s
->
h263_msmpeg4
||
s
->
codec_id
==
CODEC_ID_MPEG1VIDEO
||
s
->
codec_id
==
CODEC_ID_MPEG2VIDEO
if
(
s
->
encoding
||
!
(
s
->
msmpeg4_version
||
s
->
codec_id
==
CODEC_ID_MPEG1VIDEO
||
s
->
codec_id
==
CODEC_ID_MPEG2VIDEO
||
(
s
->
codec_id
==
CODEC_ID_MPEG4
&&
!
s
->
mpeg_quant
))){
||
(
s
->
codec_id
==
CODEC_ID_MPEG4
&&
!
s
->
mpeg_quant
))){
add_dequant_dct
(
s
,
block
[
0
],
0
,
dest_y
,
dct_linesize
,
s
->
qscale
);
add_dequant_dct
(
s
,
block
[
0
],
0
,
dest_y
,
dct_linesize
,
s
->
qscale
);
add_dequant_dct
(
s
,
block
[
1
],
1
,
dest_y
+
block_size
,
dct_linesize
,
s
->
qscale
);
add_dequant_dct
(
s
,
block
[
1
],
1
,
dest_y
+
block_size
,
dct_linesize
,
s
->
qscale
);
...
...
libavcodec/mpegvideo.h
浏览文件 @
8c51620f
...
@@ -207,7 +207,6 @@ typedef struct MpegEncContext {
...
@@ -207,7 +207,6 @@ typedef struct MpegEncContext {
/* the following codec id fields are deprecated in favor of codec_id */
/* the following codec id fields are deprecated in favor of codec_id */
int
h263_plus
;
///< h263 plus headers
int
h263_plus
;
///< h263 plus headers
int
h263_msmpeg4
;
///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)
int
h263_flv
;
///< use flv h263 header
int
h263_flv
;
///< use flv h263 header
enum
CodecID
codec_id
;
/* see CODEC_ID_xxx */
enum
CodecID
codec_id
;
/* see CODEC_ID_xxx */
...
@@ -831,4 +830,3 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
...
@@ -831,4 +830,3 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
int
motion_x
,
int
motion_y
);
int
motion_x
,
int
motion_y
);
#endif
/* AVCODEC_MPEGVIDEO_H */
#endif
/* AVCODEC_MPEGVIDEO_H */
libavcodec/mpegvideo_enc.c
浏览文件 @
8c51620f
...
@@ -639,7 +639,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
...
@@ -639,7 +639,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break
;
break
;
case
CODEC_ID_MSMPEG4V2
:
case
CODEC_ID_MSMPEG4V2
:
s
->
out_format
=
FMT_H263
;
s
->
out_format
=
FMT_H263
;
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
msmpeg4_version
=
2
;
s
->
msmpeg4_version
=
2
;
...
@@ -648,7 +647,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
...
@@ -648,7 +647,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break
;
break
;
case
CODEC_ID_MSMPEG4V3
:
case
CODEC_ID_MSMPEG4V3
:
s
->
out_format
=
FMT_H263
;
s
->
out_format
=
FMT_H263
;
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
msmpeg4_version
=
3
;
s
->
msmpeg4_version
=
3
;
...
@@ -658,7 +656,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
...
@@ -658,7 +656,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break
;
break
;
case
CODEC_ID_WMV1
:
case
CODEC_ID_WMV1
:
s
->
out_format
=
FMT_H263
;
s
->
out_format
=
FMT_H263
;
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
msmpeg4_version
=
4
;
s
->
msmpeg4_version
=
4
;
...
@@ -668,7 +665,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
...
@@ -668,7 +665,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break
;
break
;
case
CODEC_ID_WMV2
:
case
CODEC_ID_WMV2
:
s
->
out_format
=
FMT_H263
;
s
->
out_format
=
FMT_H263
;
s
->
h263_msmpeg4
=
1
;
s
->
h263_pred
=
1
;
s
->
h263_pred
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
unrestricted_mv
=
1
;
s
->
msmpeg4_version
=
5
;
s
->
msmpeg4_version
=
5
;
...
@@ -2771,7 +2767,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
...
@@ -2771,7 +2767,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
/* we need to initialize some time vars before we can encode b-frames */
/* we need to initialize some time vars before we can encode b-frames */
// RAL: Condition added for MPEG1VIDEO
// RAL: Condition added for MPEG1VIDEO
if
(
s
->
codec_id
==
CODEC_ID_MPEG1VIDEO
||
s
->
codec_id
==
CODEC_ID_MPEG2VIDEO
||
(
s
->
h263_pred
&&
!
s
->
h263_msmpeg4
))
if
(
s
->
codec_id
==
CODEC_ID_MPEG1VIDEO
||
s
->
codec_id
==
CODEC_ID_MPEG2VIDEO
||
(
s
->
h263_pred
&&
!
s
->
msmpeg4_version
))
set_frame_distances
(
s
);
set_frame_distances
(
s
);
if
(
CONFIG_MPEG4_ENCODER
&&
s
->
codec_id
==
CODEC_ID_MPEG4
)
if
(
CONFIG_MPEG4_ENCODER
&&
s
->
codec_id
==
CODEC_ID_MPEG4
)
ff_set_mpeg4_time
(
s
);
ff_set_mpeg4_time
(
s
);
...
@@ -2940,7 +2936,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
...
@@ -2940,7 +2936,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
case
FMT_H263
:
case
FMT_H263
:
if
(
CONFIG_WMV2_ENCODER
&&
s
->
codec_id
==
CODEC_ID_WMV2
)
if
(
CONFIG_WMV2_ENCODER
&&
s
->
codec_id
==
CODEC_ID_WMV2
)
ff_wmv2_encode_picture_header
(
s
,
picture_number
);
ff_wmv2_encode_picture_header
(
s
,
picture_number
);
else
if
(
CONFIG_MSMPEG4_ENCODER
&&
s
->
h263_msmpeg4
)
else
if
(
CONFIG_MSMPEG4_ENCODER
&&
s
->
msmpeg4_version
)
msmpeg4_encode_picture_header
(
s
,
picture_number
);
msmpeg4_encode_picture_header
(
s
,
picture_number
);
else
if
(
CONFIG_MPEG4_ENCODER
&&
s
->
h263_pred
)
else
if
(
CONFIG_MPEG4_ENCODER
&&
s
->
h263_pred
)
mpeg4_encode_picture_header
(
s
,
picture_number
);
mpeg4_encode_picture_header
(
s
,
picture_number
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录