apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-12-24 11:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge commit of 'vdpau: remove old-style decoders'"

Browse Source 
This reverts commit bf36dc50ea, reversing
changes made to b7fc2693c7.

Conflicts:

	libavcodec/h264.c

Keeping support for the old VDPAU API has been requested by our VDPAU maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-17 15:31:14 +02:00
parent 0a141b0e49
commit a0c6c8e53e
13 changed files with 552 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/mpeg4videodec.c
View File

@@ -2384,3 +2384,21 @@ AVCodec ff_mpeg4_decoder = {
.priv_class = &mpeg4_class,
};
#if CONFIG_MPEG4_VDPAU_DECODER
AVCodec ff_mpeg4_vdpau_decoder = {
.name = "mpeg4_vdpau",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4,
.priv_data_size = sizeof(MpegEncContext),
.init = decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
CODEC_CAP_HWACCEL_VDPAU,
.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"),
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_MPEG4,
AV_PIX_FMT_NONE },
.priv_class = &mpeg4_vdpau_class,
};
#endif