diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2003-01-19 23:39:59 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2003-01-19 23:39:59 +0000 |
| commit | ee27cce6f303894a85cbf2dfd06d79b72d79887c (patch) | |
| tree | 85d8f48f94920dd70b4b439cab19604e9613f29a | |
| parent | 7e51a8b664c140d9d30025a4af2b5e5e5edb74ee (diff) | |
Fix codecsRELEASE-0_5_2-PANICROOMBRANCH-RELEASE-0_5_2-ROOTBRANCH-GSTREAMER-0_6-ROOTBRANCH-RELEASE-0_5_2
Original commit message from CVS:
Fix codecs
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegallcodecmap.c | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common b/common -Subproject 895baa0fa0f829ef752424a31bbb2cf68e63842 +Subproject bbd74e96ef37a7d437930f85f939a6a7d36dd01 diff --git a/ext/ffmpeg/gstffmpegallcodecmap.c b/ext/ffmpeg/gstffmpegallcodecmap.c index e097284..f4490ab 100644 --- a/ext/ffmpeg/gstffmpegallcodecmap.c +++ b/ext/ffmpeg/gstffmpegallcodecmap.c @@ -514,15 +514,15 @@ gst_ffmpeg_caps_to_codecid (GstCaps *caps, case GST_MAKE_FOURCC('x','2','6','3'): id = CODEC_ID_H263; /* or H263[IP] */ break; - case GST_MAKE_FOURCC('D','I','V','X'): case GST_MAKE_FOURCC('d','i','v','x'): case GST_MAKE_FOURCC('D','I','V','3'): 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('D','I','V','X'): + case GST_MAKE_FOURCC('D','X','5','0'): case GST_MAKE_FOURCC('X','V','I','D'): id = CODEC_ID_MPEG4; break; |