diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-10-18 18:06:14 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-10-18 18:06:14 +0000 |
| commit | 2b6838d77c8fa4efbd24f8545449667c7aae65bd (patch) | |
| tree | 7c4199db7c66fe06f41bab0aff9fa95e04813825 /gst/matroska | |
| parent | 0c40cd0a90fb2c005cec86d53da81938b18e1194 (diff) | |
gst/matroska/matroska-mux.c: Fix mpeg4 input handling (#318847); also, while we're at it, fix media type for Motion-J...
Original commit message from CVS:
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps),
(gst_matroska_mux_audio_pad_setcaps):
Fix mpeg4 input handling (#318847); also, while we're at it,
fix media type for Motion-JPEG: should be image/jpeg.
Diffstat (limited to 'gst/matroska')
| -rw-r--r-- | gst/matroska/matroska-mux.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 044a62cd..3d7944f9 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -73,7 +73,7 @@ static GstStaticPadTemplate videosink_templ = COMMON_VIDEO_CAPS "; " "video/x-msmpeg, " COMMON_VIDEO_CAPS "; " - "video/x-jpeg, " + "image/jpeg, " COMMON_VIDEO_CAPS "; " "video/x-raw-yuv, " "format = (fourcc) { YUY2, I420 }, " COMMON_VIDEO_CAPS) @@ -473,7 +473,7 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) gst_structure_get_fourcc (structure, "format", &videocontext->fourcc); return TRUE; - } else if (!strcmp (mimetype, "video/x-jpeg")) { + } else if (!strcmp (mimetype, "image/jpeg")) { context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MJPEG); return TRUE; @@ -568,9 +568,11 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) case 2: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG2); break; - case 3: + case 4: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP); break; + default: + return FALSE; } return TRUE; @@ -649,6 +651,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps) context->default_duration = 1152 * GST_SECOND / audiocontext->samplerate; break; + default: + return FALSE; } break; } @@ -658,6 +662,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps) case 4: context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG4 "MAIN"); break; + default: + return FALSE; } return TRUE; |