mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroska-mux: fix last commit

Browse source 
Use a local define for WAVEFORMAT_EX based on the size of the struct + 2 bytes
for the extension size.
This commit is contained in:
Stefan Kost 2010-04-08 13:23:38 +03:00
parent e032fd753e
commit acc742bbc9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/matroska/matroska-mux.c
View file

@ -69,6 +69,9 @@ enum
#define DEFAULT_WRITING_APP "GStreamer Matroska muxer" #define DEFAULT_WRITING_APP "GStreamer Matroska muxer"
#define DEFAULT_MIN_INDEX_INTERVAL 0 #define DEFAULT_MIN_INDEX_INTERVAL 0
/* WAVEFORMATEX is gst_riff_strf_auds + an extra guint16 extension size */
#define WAVEFORMATEX_SIZE (2 + sizeof (gst_riff_strf_auds))
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
@ -1624,7 +1627,7 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
if (gst_structure_get_int (structure, "depth", &depth)) if (gst_structure_get_int (structure, "depth", &depth))
audiocontext->bitdepth = depth; audiocontext->bitdepth = depth;
codec_priv_size = sizeof (gst_riff_strf_auds); codec_priv_size = WAVEFORMATEX_SIZE;
if (buf) if (buf)
codec_priv_size += GST_BUFFER_SIZE (buf); codec_priv_size += GST_BUFFER_SIZE (buf);
@ -1643,7 +1646,7 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
/* process codec private/initialization data, if any */ /* process codec private/initialization data, if any */
if (buf) { if (buf) {
memcpy ((guint8 *) codec_priv + sizeof (gst_riff_strf_auds), memcpy ((guint8 *) codec_priv + WAVEFORMATEX_SIZE,
GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
} }