The new name better reflects what the decoder is for and is consistent
with the names of other similar components.
---
configure | 4 ++--
libavcodec/allcodecs.c | 4 ++--
libavcodec/mpeg12dec.c | 9 +++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 111f9fd..0471604 100755
--- a/configure
+++ b/configure
@@ -1659,8 +1659,6 @@ h264_vdpau_decoder_deps="vdpau"
h264_vdpau_decoder_select="h264_decoder"
h264_vdpau_hwaccel_deps="vdpau"
h264_vdpau_hwaccel_select="h264_decoder"
-mpeg_vdpau_decoder_deps="vdpau"
-mpeg_vdpau_decoder_select="mpegvideo_decoder"
mpeg1_vdpau_decoder_deps="vdpau"
mpeg1_vdpau_decoder_select="mpeg1video_decoder"
mpeg1_vdpau_hwaccel_deps="vdpau"
@@ -1669,6 +1667,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2"
mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
mpeg2_vaapi_hwaccel_deps="vaapi"
mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
+mpeg2_vdpau_decoder_deps="vdpau"
+mpeg2_vdpau_decoder_select="mpegvideo_decoder"
mpeg2_vdpau_hwaccel_deps="vdpau"
mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
mpeg4_vaapi_hwaccel_deps="vaapi"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 8bfa603..79dd8c9 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -177,9 +177,9 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
REGISTER_ENCDEC (MPEG4, mpeg4);
- REGISTER_DECODER(MPEG4_VDPAU, mpeg4_vdpau);
- REGISTER_DECODER(MPEG_VDPAU, mpeg_vdpau);
REGISTER_DECODER(MPEG1_VDPAU, mpeg1_vdpau);
+ REGISTER_DECODER(MPEG2_VDPAU, mpeg2_vdpau);
+ REGISTER_DECODER(MPEG4_VDPAU, mpeg4_vdpau);
REGISTER_DECODER(MSA1, msa1);
REGISTER_DECODER(MSMPEG4V1, msmpeg4v1);
REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 368b90e..3667b12 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2078,7 +2078,8 @@ static int decode_chunks(AVCodecContext *avctx,
s2->er.error_count +=
s2->thread_context[i]->er.error_count;
}
- if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities &
CODEC_CAP_HWACCEL_VDPAU)
+ if (CONFIG_MPEG2_VDPAU_DECODER &&
+ avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_mpeg_picture_complete(s2, buf, buf_size,
s->slice_count);
ret = slice_end(avctx, picture);
@@ -2442,9 +2443,9 @@ AVCodec ff_mpeg_xvmc_decoder = {
#endif
-#if CONFIG_MPEG_VDPAU_DECODER
-AVCodec ff_mpeg_vdpau_decoder = {
- .name = "mpegvideo_vdpau",
+#if CONFIG_MPEG2_VDPAU_DECODER
+AVCodec ff_mpeg2_vdpau_decoder = {
+ .name = "mpeg2video_vdpau",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO,
.priv_data_size = sizeof(Mpeg1Context),
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
