diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:24:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:24:22 +0200 |
| commit | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (patch) | |
| tree | c6680553d1ea71baf7408233b6eec6ab92d75b8a /libavcodec/mpeg4videodec.c | |
| parent | b7fc2693c70fe72936e4ce124c802ac23857c476 (diff) | |
| parent | 578ea75a9e4ac56e0bbbbe668700be756aa699f8 (diff) | |
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
vdpau: remove old-style decoders
Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index be4aa37589..6cf1ec1a32 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2369,21 +2369,3 @@ 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 |