diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 15:31:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 22:17:49 +0200 |
| commit | a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7 (patch) | |
| tree | add4728a4e1bbc762e5c058259103e659455217a /libavcodec/mpeg4videodec.c | |
| parent | 0a141b0e49ba3989a28f5f006a978bdab92a9217 (diff) | |
| download | android_external_ffmpeg-a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7.tar.gz android_external_ffmpeg-a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7.tar.bz2 android_external_ffmpeg-a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7.zip | |
Revert "Merge commit of 'vdpau: remove old-style decoders'"
This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing
changes made to b7fc2693c70fe72936e4ce124c802ac23857c476.
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>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 84a0dac88b..9ff7574bf7 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -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 |