summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 06f28a5..1337b58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-30 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
+ Add mapping for IMC and MLP audio codecs.
+
2008-12-30 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* ffmpegrev:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index e945fd2..1bc6def 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -585,6 +585,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
}
break;
+ case CODEC_ID_MLP:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-mlp", NULL);
+ break;
+
+ case CODEC_ID_IMC:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-imc", NULL);
+ break;
+
/* MJPEG is normal JPEG, Motion-JPEG and Quicktime MJPEG-A. MJPEGB
* is Quicktime's MJPEG-B. LJPEG is lossless JPEG. I don't know what
* sp5x is, but it's apparently something JPEG... We don't separate