diff options
| author | Chris Browet <koying@semperpax.com> | 2015-11-14 15:47:43 +0100 |
|---|---|---|
| committer | Chris Browet <koying@semperpax.com> | 2015-11-14 15:47:43 +0100 |
| commit | a08cbdb892574a1168cfa2a3cab7452877edded7 (patch) | |
| tree | a9e113549ebcae335bf496536d8a869d82e24231 | |
| parent | 62bba67c784a20d29dd4a76cb835bbae79de1eed (diff) | |
| parent | 344af8f8d863bd6ef201c349a0d996e814edf52a (diff) | |
Merge pull request #8383 from koying/fixdroidmpeg2
FIX: [droid] Only sw for SD MPEG
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp index 84e9ef1700..fbfc8b3092 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -216,6 +216,8 @@ 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) @@ -270,6 +272,8 @@ 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) @@ -286,6 +290,8 @@ 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) @@ -328,6 +334,8 @@ 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) |