summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-06-29 22:16:55 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-06-29 22:16:55 +0000
commit0d6643f50ef56189ec14ce32661f2eaf5e85f1e5 (patch)
treefcd702104abeb848e5b9a243b497db0e1b709b49
parentbcda42285133183e6271b26106fa5ac0e42bf57d (diff)
ext/ffmpeg/gstffmpegcodecmap.c: Buffer = miniobject, not boxed.BRANCH-THREADED
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid): Buffer = miniobject, not boxed.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ecca23..b7dbc3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
+ Buffer = miniobject, not boxed.
+
2005-05-26 Luca Ognibene <luogni@tin.it>
* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event)
diff --git a/common b/common
-Subproject 67b7e6c0db99415e0440d0c576495641b53e976
+Subproject 2826306411790bf8aa9298922aa59b126897431
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 01027af..c9b40d0 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1173,7 +1173,7 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
/* extradata parsing (esds [mpeg4], wma/wmv, msmpeg4v1/2/3, etc.) */
if ((value = gst_structure_get_value (str, "codec_data"))) {
- buf = g_value_get_boxed (value);
+ buf = GST_BUFFER (gst_value_get_mini_object (value));
context->extradata = av_mallocz (GST_BUFFER_SIZE (buf));
memcpy (context->extradata, GST_BUFFER_DATA (buf),
GST_BUFFER_SIZE (buf));