Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
a383f226
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,发现更多精彩内容 >>
提交
a383f226
编写于
8月 17, 2015
作者:
W
wm4
提交者:
Ronald S. Bultje
8月 18, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavc: move vdpau decoders under FF_API_VDPAU.
Signed-off-by:
N
Ronald S. Bultje
<
rsbultje@gmail.com
>
上级
030b5a4f
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
22 addition
and
12 deletion
+22
-12
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+10
-0
libavcodec/h264.c
libavcodec/h264.c
+1
-1
libavcodec/mpeg12dec.c
libavcodec/mpeg12dec.c
+4
-4
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videodec.c
+1
-1
libavcodec/vc1dec.c
libavcodec/vc1dec.c
+2
-2
libavcodec/vdpau.c
libavcodec/vdpau.c
+4
-4
未找到文件。
libavcodec/allcodecs.c
浏览文件 @
a383f226
...
...
@@ -190,7 +190,9 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
H264_MMAL
,
h264_mmal
);
REGISTER_DECODER
(
H264_QSV
,
h264_qsv
);
REGISTER_DECODER
(
H264_VDA
,
h264_vda
);
#if FF_API_VDPAU
REGISTER_DECODER
(
H264_VDPAU
,
h264_vdpau
);
#endif
REGISTER_ENCDEC
(
HAP
,
hap
);
REGISTER_DECODER
(
HEVC
,
hevc
);
REGISTER_DECODER
(
HEVC_QSV
,
hevc_qsv
);
...
...
@@ -227,10 +229,14 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
MPEG2VIDEO
,
mpeg2video
);
REGISTER_ENCDEC
(
MPEG4
,
mpeg4
);
REGISTER_DECODER
(
MPEG4_CRYSTALHD
,
mpeg4_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
MPEG4_VDPAU
,
mpeg4_vdpau
);
#endif
REGISTER_DECODER
(
MPEGVIDEO
,
mpegvideo
);
#if FF_API_VDPAU
REGISTER_DECODER
(
MPEG_VDPAU
,
mpeg_vdpau
);
REGISTER_DECODER
(
MPEG1_VDPAU
,
mpeg1_vdpau
);
#endif
REGISTER_DECODER
(
MPEG2_CRYSTALHD
,
mpeg2_crystalhd
);
REGISTER_DECODER
(
MPEG2_QSV
,
mpeg2_qsv
);
REGISTER_DECODER
(
MSA1
,
msa1
);
...
...
@@ -311,7 +317,9 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
VBLE
,
vble
);
REGISTER_DECODER
(
VC1
,
vc1
);
REGISTER_DECODER
(
VC1_CRYSTALHD
,
vc1_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
VC1_VDPAU
,
vc1_vdpau
);
#endif
REGISTER_DECODER
(
VC1IMAGE
,
vc1image
);
REGISTER_DECODER
(
VC1_QSV
,
vc1_qsv
);
REGISTER_DECODER
(
VCR1
,
vcr1
);
...
...
@@ -331,7 +339,9 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
WMV2
,
wmv2
);
REGISTER_DECODER
(
WMV3
,
wmv3
);
REGISTER_DECODER
(
WMV3_CRYSTALHD
,
wmv3_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
WMV3_VDPAU
,
wmv3_vdpau
);
#endif
REGISTER_DECODER
(
WMV3IMAGE
,
wmv3image
);
REGISTER_DECODER
(
WNV1
,
wnv1
);
REGISTER_DECODER
(
XAN_WC3
,
xan_wc3
);
...
...
libavcodec/h264.c
浏览文件 @
a383f226
...
...
@@ -1996,7 +1996,7 @@ AVCodec ff_h264_decoder = {
.
priv_class
=
&
h264_class
,
};
#if CONFIG_H264_VDPAU_DECODER
#if CONFIG_H264_VDPAU_DECODER
&& FF_API_VDPAU
static
const
AVClass
h264_vdpau_class
=
{
.
class_name
=
"H264 VDPAU Decoder"
,
.
item_name
=
av_default_item_name
,
...
...
libavcodec/mpeg12dec.c
浏览文件 @
a383f226
...
...
@@ -1186,7 +1186,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG1_XVMC_HWACCEL
AV_PIX_FMT_XVMC
,
#endif
#if CONFIG_MPEG1_VDPAU_DECODER
#if CONFIG_MPEG1_VDPAU_DECODER
&& FF_API_VDPAU
AV_PIX_FMT_VDPAU_MPEG1
,
#endif
#if CONFIG_MPEG1_VDPAU_HWACCEL
...
...
@@ -1200,7 +1200,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG2_XVMC_HWACCEL
AV_PIX_FMT_XVMC
,
#endif
#if CONFIG_MPEG_VDPAU_DECODER
#if CONFIG_MPEG_VDPAU_DECODER
&& FF_API_VDPAU
AV_PIX_FMT_VDPAU_MPEG2
,
#endif
#if CONFIG_MPEG2_VDPAU_HWACCEL
...
...
@@ -2954,7 +2954,7 @@ AVCodec ff_mpeg_xvmc_decoder = {
#endif
#endif
/* FF_API_XVMC */
#if CONFIG_MPEG_VDPAU_DECODER
#if CONFIG_MPEG_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_mpeg_vdpau_decoder
=
{
.
name
=
"mpegvideo_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1/2 video (VDPAU acceleration)"
),
...
...
@@ -2970,7 +2970,7 @@ AVCodec ff_mpeg_vdpau_decoder = {
};
#endif
#if CONFIG_MPEG1_VDPAU_DECODER
#if CONFIG_MPEG1_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_mpeg1_vdpau_decoder
=
{
.
name
=
"mpeg1video_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video (VDPAU acceleration)"
),
...
...
libavcodec/mpeg4videodec.c
浏览文件 @
a383f226
...
...
@@ -2789,7 +2789,7 @@ AVCodec ff_mpeg4_decoder = {
};
#if CONFIG_MPEG4_VDPAU_DECODER
#if CONFIG_MPEG4_VDPAU_DECODER
&& FF_API_VDPAU
static
const
AVClass
mpeg4_vdpau_class
=
{
"MPEG4 Video VDPAU Decoder"
,
av_default_item_name
,
...
...
libavcodec/vc1dec.c
浏览文件 @
a383f226
...
...
@@ -1156,7 +1156,7 @@ AVCodec ff_wmv3_decoder = {
};
#endif
#if CONFIG_WMV3_VDPAU_DECODER
#if CONFIG_WMV3_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_wmv3_vdpau_decoder
=
{
.
name
=
"wmv3_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Windows Media Video 9 VDPAU"
),
...
...
@@ -1172,7 +1172,7 @@ AVCodec ff_wmv3_vdpau_decoder = {
};
#endif
#if CONFIG_VC1_VDPAU_DECODER
#if CONFIG_VC1_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_vc1_vdpau_decoder
=
{
.
name
=
"vc1_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMPTE VC-1 VDPAU"
),
...
...
libavcodec/vdpau.c
浏览文件 @
a383f226
...
...
@@ -358,6 +358,7 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
/* Obsolete non-hwaccel VDPAU support below... */
#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU
void
ff_vdpau_h264_set_reference_frames
(
H264Context
*
h
)
{
struct
vdpau_render_state
*
render
,
*
render_ref
;
...
...
@@ -443,7 +444,6 @@ void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size)
render
->
bitstream_buffers_used
++
;
}
#if CONFIG_H264_VDPAU_DECODER
void
ff_vdpau_h264_picture_start
(
H264Context
*
h
)
{
struct
vdpau_render_state
*
render
;
...
...
@@ -506,7 +506,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h)
}
#endif
/* CONFIG_H264_VDPAU_DECODER */
#if
CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER
#if
(CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) && FF_API_VDPAU
void
ff_vdpau_mpeg_picture_complete
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
int
buf_size
,
int
slice_count
)
{
...
...
@@ -565,7 +565,7 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
}
#endif
/* CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER */
#if CONFIG_VC1_VDPAU_DECODER
#if CONFIG_VC1_VDPAU_DECODER
&& FF_API_VDPAU
void
ff_vdpau_vc1_decode_picture
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
int
buf_size
)
{
...
...
@@ -636,7 +636,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
}
#endif
/* (CONFIG_VC1_VDPAU_DECODER */
#if CONFIG_MPEG4_VDPAU_DECODER
#if CONFIG_MPEG4_VDPAU_DECODER
&& FF_API_VDPAU
void
ff_vdpau_mpeg4_decode_picture
(
Mpeg4DecContext
*
ctx
,
const
uint8_t
*
buf
,
int
buf_size
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录