summaryrefslogtreecommitdiff
path: root/codec.c
diff options
context:
space:
mode:
authorJohns <johns98@gmx.net>2012-08-13 16:57:36 +0200
committerJohns <johns98@gmx.net>2012-08-13 16:57:36 +0200
commitc07ec82e6dc94020592930f5e6a206ddc1357802 (patch)
tree69224dbdf734f61a4b6b01f53c11c9b6ab9ce700 /codec.c
parentecb48a5d637ff1c41001729cbf016e5498601bac (diff)
downloadvdr-plugin-softhddevice-c07ec82e6dc94020592930f5e6a206ddc1357802.tar.gz
vdr-plugin-softhddevice-c07ec82e6dc94020592930f5e6a206ddc1357802.tar.bz2
Fix bug: Can't use software decoder with VDPAU.
Diffstat (limited to 'codec.c')
-rw-r--r--codec.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/codec.c b/codec.c
index 369eb6f..5707d6c 100644
--- a/codec.c
+++ b/codec.c
@@ -363,22 +363,6 @@ void CodecVideoOpen(VideoDecoder * decoder, const char *name, int codec_id)
if (decoder->VideoCtx) {
Error(_("codec: missing close\n"));
}
- //
- // ffmpeg compatibility hack
- //
-#if 1 || (LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52,96,0))
- if (name) {
- if (!strcmp(name, "h264video_vdpau")) {
- name = "h264_vdpau";
- } else if (!strcmp(name, "mpeg4video_vdpau")) {
- name = "mpeg4_vdpau";
- } else if (!strcmp(name, "vc1video_vdpau")) {
- name = "vc1_vdpau";
- } else if (!strcmp(name, "wmv3video_vdpau")) {
- name = "wmv3_vdpau";
- }
- }
-#endif
if (name && (video_codec = avcodec_find_decoder_by_name(name))) {
Debug(3, "codec: vdpau decoder found\n");
@@ -939,7 +923,7 @@ static void CodecAudioSetClock(AudioDecoder * audio_decoder, int64_t pts)
if (0) {
Debug(3,
- "codec/audio: interval P:%5 " PRId64 "ms T:%5" PRId64 "ms D:%4"
+ "codec/audio: interval P:%5" PRId64 "ms T:%5" PRId64 "ms D:%4"
PRId64 "ms %f %d\n", pts_diff / 90, tim_diff / (1000 * 1000),
delay / 90, drift / 90.0, audio_decoder->DriftCorr);
}