diff options
| author | davilla <davilla@4pi.com> | 2011-10-08 21:38:00 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2011-10-08 21:48:17 -0400 |
| commit | 61c4a406743278819fb8b186ce7003d6929f2101 (patch) | |
| tree | ba2f53b2e62d76b54ab217ae69155dbae7dd7114 | |
| parent | caa12da227a2871454bf04c295778a73c5df8ef7 (diff) | |
[osx] fixed borked commit 219f859487f156a1ff3882971e6df7ccea147cac, restore h264 interlace detection for vda
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp | 3 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp index 4e0bdde181..721bf37086 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp @@ -771,8 +771,7 @@ bool CDVDVideoCodecVDA::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) uint32_t sps_size = VDA_RB16(spc); if (sps_size) parseh264_sps(spc+3, sps_size-1, &interlaced, &m_max_ref_frames); - if (false) - //if (interlaced) + if (interlaced) { CFRelease(avcCData); return false; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp index 227c79b21f..3c867827cd 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp @@ -1020,8 +1020,8 @@ bool validate_avcC_spc(uint8_t *extradata, uint32_t extrasize, int32_t *max_ref_ uint32_t sps_size = VDA_RB16(spc); if (sps_size) parseh264_sps(spc+3, sps_size-1, &interlaced, max_ref_frames); - if (interlaced) - return false; + //if (interlaced) + // return false; return true; } |