diff options
| author | Jochen Dolze <vdr@dolze.de> | 2014-09-02 12:23:18 +0200 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2014-09-02 12:23:18 +0200 |
| commit | c55f43f413dff8740f99d684e8879835d4409920 (patch) | |
| tree | 3ac24aa4a9f059efb5778bcbdd271b45b539eec5 /command/markad-standalone.cpp | |
| parent | 3c99d4782fa62a1e24aabb510ce6230dc00a5b31 (diff) | |
| download | vdr-plugin-markad-c55f43f413dff8740f99d684e8879835d4409920.tar.gz vdr-plugin-markad-c55f43f413dff8740f99d684e8879835d4409920.tar.bz2 | |
Added #ifdefs for AV_CODEC_IDs, should fix bug #1898
Added logo for ProSieben MAXX HD from MegaV0lt
Diffstat (limited to 'command/markad-standalone.cpp')
| -rw-r--r-- | command/markad-standalone.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index 70e6d84..4ca71cd 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -320,28 +320,29 @@ void cMarkAdStandalone::CheckStart() } macontext.Info.Channels=macontext.Audio.Info.Channels; - if (macontext.Info.Channels==6) - { - isyslog("DolbyDigital5.1 audio detected. logo/border/aspect detection disabled"); - bDecodeVideo=false; - macontext.Video.Options.IgnoreAspectRatio=true; - macontext.Video.Options.IgnoreLogoDetection=true; - marks.Del(MT_ASPECTSTART); - marks.Del(MT_ASPECTSTOP); - // start mark must be around istart - begin=marks.GetAround(INT_MAX,iStart,MT_CHANNELSTART); - } - else - { - if (macontext.Info.DPid.Num) + if (macontext.Config->DecodeAudio) { + if (macontext.Info.Channels==6) { - if (macontext.Info.Channels) - isyslog("broadcast with %i audio channels, disabling AC3 decoding",macontext.Info.Channels); - macontext.Info.DPid.Num=0; - demux->DisableDPid(); + isyslog("DolbyDigital5.1 audio detected. logo/border/aspect detection disabled"); + bDecodeVideo=false; + macontext.Video.Options.IgnoreAspectRatio=true; + macontext.Video.Options.IgnoreLogoDetection=true; + marks.Del(MT_ASPECTSTART); + marks.Del(MT_ASPECTSTOP); + // start mark must be around istart + begin=marks.GetAround(INT_MAX,iStart,MT_CHANNELSTART); + } + else + { + if (macontext.Info.DPid.Num) + { + if (macontext.Info.Channels) + isyslog("broadcast with %i audio channels, disabling AC3 decoding",macontext.Info.Channels); + macontext.Info.DPid.Num=0; + demux->DisableDPid(); + } } } - if ((macontext.Info.AspectRatio.Num) && ((macontext.Info.AspectRatio.Num!= macontext.Video.Info.AspectRatio.Num) || (macontext.Info.AspectRatio.Den!= macontext.Video.Info.AspectRatio.Den))) |