[0.11] gst-ffmpeg: ffmpeg: Put the new layout field in raw audio caps

Sebastian Dröge slomo at kemper.freedesktop.org
Mon Jan 9 04:40:24 PST 2012


Module: gst-ffmpeg
Branch: 0.11
Commit: d2702a091e71a431d30c89995b3789fa9093b2d9
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=d2702a091e71a431d30c89995b3789fa9093b2d9

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jan  9 13:40:05 2012 +0100

ffmpeg: Put the new layout field in raw audio caps

---

 ext/ffmpeg/gstffmpegcodecmap.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index ea104a3..adc89ec 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1324,7 +1324,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       }
 
       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-raw",
-          "format", G_TYPE_STRING, gst_audio_format_to_string (format), NULL);
+          "format", G_TYPE_STRING, gst_audio_format_to_string (format),
+          "layout", G_TYPE_STRING, "interleaved", NULL);
     }
       break;
 
@@ -1814,7 +1815,8 @@ gst_ffmpeg_smpfmt_to_caps (enum SampleFormat sample_fmt,
 
   if (format != GST_AUDIO_FORMAT_UNKNOWN) {
     caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-raw",
-        "format", G_TYPE_STRING, gst_audio_format_to_string (format), NULL);
+        "format", G_TYPE_STRING, gst_audio_format_to_string (format),
+        "layout", G_TYPE_STRING, "interleaved", NULL);
     GST_LOG ("caps for sample_fmt=%d: %" GST_PTR_FORMAT, sample_fmt, caps);
   } else {
     GST_LOG ("No caps found for sample_fmt=%d", sample_fmt);



More information about the gstreamer-commits mailing list