Revert "mpeg_vdpau" back to "mpegvideo_vdpau".

This commit is contained in:
Johns 2012-08-14 16:02:44 +02:00
parent c07ec82e6d
commit e02c1fa5f9
2 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Revert "mpeg_vdpau" back to "mpegvideo_vdpau".
Fix bug: Can't use software decoder with VDPAU. Fix bug: Can't use software decoder with VDPAU.
Resume plugin, if suspend control stops. Resume plugin, if suspend control stops.
Removes old audio code (!USE_AUDIORING). Removes old audio code (!USE_AUDIORING).

View File

@ -1534,7 +1534,7 @@ int VideoDecodeInput(void)
if (last_codec_id != CODEC_ID_MPEG2VIDEO) { if (last_codec_id != CODEC_ID_MPEG2VIDEO) {
last_codec_id = CODEC_ID_MPEG2VIDEO; last_codec_id = CODEC_ID_MPEG2VIDEO;
CodecVideoOpen(MyVideoDecoder, VideoHardwareDecoder < 0 CodecVideoOpen(MyVideoDecoder, VideoHardwareDecoder < 0
&& VdpauDecoder ? "mpeg_vdpau" : NULL, && VdpauDecoder ? "mpegvideo_vdpau" : NULL,
CODEC_ID_MPEG2VIDEO); CODEC_ID_MPEG2VIDEO);
} }
break; break;