diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2003-01-18 15:54:25 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2003-01-18 15:54:25 +0000 |
| commit | dd34f1fefadaca96eceb0d8aac56cfaada946d0a (patch) | |
| tree | 475b2fa0c875fd99810807948f3dbe0aafed1434 | |
| parent | 446e4c8d674bf727818213821e921311067289c0 (diff) | |
| download | gst-libav-dd34f1fefadaca96eceb0d8aac56cfaada946d0a.tar.gz | |
Map XVID to mpeg4
Original commit message from CVS:
Map XVID to mpeg4
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegallcodecmap.c | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common b/common -Subproject 2a013c06fe9bf1379966cd12e6bf8c30915c5f1 +Subproject 895baa0fa0f829ef752424a31bbb2cf68e63842 diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c index 3a47db5..e097284 100644 --- a/ext/ffmpeg/gstffmpegallcodecmap.c +++ b/ext/ffmpeg/gstffmpegallcodecmap.c @@ -520,17 +520,18 @@ gst_ffmpeg_caps_to_codecid (GstCaps *caps, case GST_MAKE_FOURCC('D','I','V','4'): case GST_MAKE_FOURCC('D','I','V','5'): case GST_MAKE_FOURCC('D','X','5','0'): + case GST_MAKE_FOURCC('M','P','4','3'): id = CODEC_ID_MSMPEG4V3; break; + case GST_MAKE_FOURCC('X','V','I','D'): + id = CODEC_ID_MPEG4; + break; case GST_MAKE_FOURCC('M','P','G','4'): id = CODEC_ID_MSMPEG4V1; break; case GST_MAKE_FOURCC('M','P','4','2'): id = CODEC_ID_MSMPEG4V2; break; - case GST_MAKE_FOURCC('M','P','4','3'): - id = CODEC_ID_MSMPEG4V3; - break; case GST_MAKE_FOURCC('W','M','V','1'): id = CODEC_ID_WMV1; break; |