[vlc-commits] videotoolbox: disable XVID decoding

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Aug  3 00:33:16 2016 +0200| [7fd422ce095f1f233151f37dd26e8986e79d372e] | committer: Felix Paul Kühne

videotoolbox: disable XVID decoding

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7fd422ce095f1f233151f37dd26e8986e79d372e
---

 modules/codec/videotoolbox.m | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 63f680b..449348b 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -185,8 +185,17 @@ static CMVideoCodecType CodecPrecheck(decoder_t *p_dec)
 
             break;
         case VLC_CODEC_MP4V:
+        {
+            if (p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'X','V','I','D' )) {
+                msg_Warn(p_dec, "XVID decoding not implemented, fallback on software");
+                return -1;
+            }
+
+            msg_Dbg(p_dec, "Will decode MP4V with original FourCC '%4.4s'", (char *)&p_dec->fmt_in.i_original_fourcc);
             codec = kCMVideoCodecType_MPEG4Video;
+
             break;
+        }
         case VLC_CODEC_H263:
             codec = kCMVideoCodecType_H263;
             break;