generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ff_ to AVHWAccel decoders

Browse Source 
That unbreaks compilation of vaapi and dxva2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit d1b6f33bf2)
This commit is contained in:
Luca Barbato 2011-01-27 03:56:14 +01:00 committed by Michael Niedermayer
parent 66355be3c3
commit 1d20121b2e
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dxva2_h264.c
View File

@ -423,7 +423,7 @@ static int end_frame(AVCodecContext *avctx)
commit_bitstream_and_slice_buffer);
}
AVHWAccel h264_dxva2_hwaccel = {
AVHWAccel ff_h264_dxva2_hwaccel = {
.name = "h264_dxva2",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,

2
libavcodec/dxva2_mpeg2.c
View File

@ -260,7 +260,7 @@ static int end_frame(AVCodecContext *avctx)
commit_bitstream_and_slice_buffer);
}
AVHWAccel mpeg2_dxva2_hwaccel = {
AVHWAccel ff_mpeg2_dxva2_hwaccel = {
.name = "mpeg2_dxva2",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG2VIDEO,

4
libavcodec/dxva2_vc1.c
View File

@ -264,7 +264,7 @@ static int end_frame(AVCodecContext *avctx)
}
#if CONFIG_WMV3_DXVA2_HWACCEL
AVHWAccel wmv3_dxva2_hwaccel = {
AVHWAccel ff_wmv3_dxva2_hwaccel = {
.name = "wmv3_dxva2",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_WMV3,
@ -277,7 +277,7 @@ AVHWAccel wmv3_dxva2_hwaccel = {
};
#endif
AVHWAccel vc1_dxva2_hwaccel = {
AVHWAccel ff_vc1_dxva2_hwaccel = {
.name = "vc1_dxva2",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_VC1,

2
libavcodec/vaapi_h264.c
View File

@ -334,7 +334,7 @@ static int decode_slice(AVCodecContext *avctx,
return 0;
}
AVHWAccel h264_vaapi_hwaccel = {
AVHWAccel ff_h264_vaapi_hwaccel = {
.name = "h264_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,

2
libavcodec/vaapi_mpeg2.c
View File

@ -138,7 +138,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
return 0;
}
AVHWAccel mpeg2_vaapi_hwaccel = {
AVHWAccel ff_mpeg2_vaapi_hwaccel = {
.name = "mpeg2_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG2VIDEO,

4
libavcodec/vaapi_mpeg4.c
View File

@ -150,7 +150,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
}
#if CONFIG_MPEG4_VAAPI_HWACCEL
AVHWAccel mpeg4_vaapi_hwaccel = {
AVHWAccel ff_mpeg4_vaapi_hwaccel = {
.name = "mpeg4_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_MPEG4,
@ -164,7 +164,7 @@ AVHWAccel mpeg4_vaapi_hwaccel = {
#endif
#if CONFIG_H263_VAAPI_HWACCEL
AVHWAccel h263_vaapi_hwaccel = {
AVHWAccel ff_h263_vaapi_hwaccel = {
.name = "h263_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H263,

4
libavcodec/vaapi_vc1.c
View File

@ -326,7 +326,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
}
#if CONFIG_WMV3_VAAPI_HWACCEL
AVHWAccel wmv3_vaapi_hwaccel = {
AVHWAccel ff_wmv3_vaapi_hwaccel = {
.name = "wmv3_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_WMV3,
@ -339,7 +339,7 @@ AVHWAccel wmv3_vaapi_hwaccel = {
};
#endif
AVHWAccel vc1_vaapi_hwaccel = {
AVHWAccel ff_vc1_vaapi_hwaccel = {
.name = "vc1_vaapi",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_VC1,