aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Browet <koying@semperpax.com>2015-11-14 20:24:09 +0100
committerChris Browet <koying@semperpax.com>2015-11-14 20:24:09 +0100
commit687753486ac9fd8b8ec23d3bbd27a65ceacb8266 (patch)
treebdf3fdf4b9666928fa55e10c55d6cd7508d28ea0
parenta08cbdb892574a1168cfa2a3cab7452877edded7 (diff)
parent1145693bb991d999fe6f9c00895226f050a42bd7 (diff)
Merge pull request #8384 from stefansaraev/amc-sd16.0b1-Jarvis
[amcodec] partialy revert 344af8f
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index fbfc8b3092..33638951e9 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -216,8 +216,6 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
case AV_CODEC_ID_MPEG4:
case AV_CODEC_ID_MSMPEG4V2:
case AV_CODEC_ID_MSMPEG4V3:
- case AV_CODEC_ID_MPEG1VIDEO:
- case AV_CODEC_ID_MPEG2VIDEO:
// Avoid h/w decoder for SD; Those files might use features
// not supported and can easily be soft-decoded
if (hint.width <= 800)