diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2011-01-27 05:56:14 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-28 05:15:35 +0300 |
commit | 1d20121b2e32aa01692ed79997e9423d8856422b (patch) | |
tree | 5a3e349fb985fad652965a7b7d2fd79762118189 /libavcodec | |
parent | 66355be3c3eb8e797589058b0773f773a8c2231e (diff) |
Add ff_ to AVHWAccel decoders
That unbreaks compilation of vaapi and dxva2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit d1b6f33bf2ce56f013a1c5a013a19671c0f30ea0)
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dxva2_h264.c | 2 | ||||
-rw-r--r-- | libavcodec/dxva2_mpeg2.c | 2 | ||||
-rw-r--r-- | libavcodec/dxva2_vc1.c | 4 | ||||
-rw-r--r-- | libavcodec/vaapi_h264.c | 2 | ||||
-rw-r--r-- | libavcodec/vaapi_mpeg2.c | 2 | ||||
-rw-r--r-- | libavcodec/vaapi_mpeg4.c | 4 | ||||
-rw-r--r-- | libavcodec/vaapi_vc1.c | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index bdb42df3f7..17fb2b55c3 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -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, diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 3b75dae11c..780542a6c1 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -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, diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index a11121347a..2b9a690ebc 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -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, diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 29f3a81bac..229c0f9b24 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -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, diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 2e870dcfa0..f56873c104 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -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, diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 8f02e91397..72822c370e 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -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, diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 2c24042ab5..d7bae009dc 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -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, |