From: Gildas Bazin <gbazin@videolan.org>
Date: Wed, 8 Jun 2005 07:34:58 +0000 (+0000)
Subject: * modules/codec/ffmpeg/ffmpeg.c, modules/packetizer/mpeg4video.c: backport of 11348.
X-Git-Tag: 0.8.2~80
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c84e40d0a9048e364c2eeb61b416ae57bbb05080;p=vlc

* modules/codec/ffmpeg/ffmpeg.c, modules/packetizer/mpeg4video.c: backport of 11348.
---

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index d12d77318b..e3cbfbd5f0 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -447,6 +447,8 @@ static struct
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('M','P','4','V'), CODEC_ID_MPEG4,
+      VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC( 4,  0,  0,  0 ), CODEC_ID_MPEG4,
       VIDEO_ES, "MPEG-4 Video" },
     { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4,
diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index cc380d0f88..bd12feb32f 100644
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -121,6 +121,7 @@ static int Open( vlc_object_t *p_this )
         case VLC_FOURCC( 'm', 'p', '4', 's'):
         case VLC_FOURCC( 'M', 'P', '4', 'S'):
         case VLC_FOURCC( 'm', 'p', '4', 'v'):
+        case VLC_FOURCC( 'M', 'P', '4', 'V'):
         case VLC_FOURCC( 'D', 'I', 'V', 'X'):
         case VLC_FOURCC( 'd', 'i', 'v', 'x'):
         case VLC_FOURCC( 'X', 'V', 'I', 'D'):