Skip to content

V
vlc
Commit c84e40d0 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

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

parent 4c04bf3e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ c84e40d0
...@@ -447,6 +447,8 @@ static struct ...@@ -447,6 +447,8 @@ static struct
VIDEO_ES, "MPEG-4 Video" }, VIDEO_ES, "MPEG-4 Video" },
{ VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4, { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
VIDEO_ES, "MPEG-4 Video" }, 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, { VLC_FOURCC( 4, 0, 0, 0 ), CODEC_ID_MPEG4,
VIDEO_ES, "MPEG-4 Video" }, VIDEO_ES, "MPEG-4 Video" },
{ VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4, { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4,
......
modules/packetizer/mpeg4video.c
View file @ c84e40d0
...@@ -121,6 +121,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -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', '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( 'M', 'P', '4', 'V'):
case VLC_FOURCC( 'D', 'I', 'V', 'X'): case VLC_FOURCC( 'D', 'I', 'V', 'X'):
case VLC_FOURCC( 'd', 'i', 'v', 'x'): case VLC_FOURCC( 'd', 'i', 'v', 'x'):
case VLC_FOURCC( 'X', 'V', 'I', 'D'): case VLC_FOURCC( 'X', 'V', 'I', 'D'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment