diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 15:50:37 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 15:50:37 +0100 |
| commit | a01a4ea2d3e98c7ffcedf67d48a167e5dfdd1c07 (patch) | |
| tree | 62de4d4a57689565d72c5c707f74db1a7d5a9108 /ext | |
| parent | c849631686baf0012ca89d9f64cc8665277cbcba (diff) | |
| parent | 1f543ec0ada7849a25a6451679eeb3cd3f605c1f (diff) | |
| download | gstreamer-plugins-bad-a01a4ea2d3e98c7ffcedf67d48a167e5dfdd1c07.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
tests/check/elements/camerabin2.c
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opus/gstopusenc.c | 3 | ||||
| -rw-r--r-- | ext/vp8/GstVP8Enc.prs | 7 | ||||
| -rw-r--r-- | ext/vp8/Makefile.am | 5 | ||||
| -rw-r--r-- | ext/vp8/gstvp8dec.c | 1 |
4 files changed, 16 insertions, 0 deletions
diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c index 999c0f39f..fd2f0ad62 100644 --- a/ext/opus/gstopusenc.c +++ b/ext/opus/gstopusenc.c @@ -345,6 +345,7 @@ gst_opus_enc_stop (GstAudioEncoder * benc) gst_tag_list_free (enc->tags); enc->tags = NULL; g_slist_foreach (enc->headers, (GFunc) gst_buffer_unref, NULL); + g_slist_free (enc->headers); enc->headers = NULL; gst_tag_setter_reset_tags (GST_TAG_SETTER (enc)); @@ -879,6 +880,7 @@ gst_opus_enc_handle_frame (GstAudioEncoder * benc, GstBuffer * buf) GstCaps *caps; g_slist_foreach (enc->headers, (GFunc) gst_buffer_unref, NULL); + g_slist_free (enc->headers); enc->headers = NULL; gst_opus_header_create_caps (&caps, &enc->headers, enc->n_channels, @@ -891,6 +893,7 @@ gst_opus_enc_handle_frame (GstAudioEncoder * benc, GstBuffer * buf) GST_DEBUG_OBJECT (enc, "here are the caps: %" GST_PTR_FORMAT, caps); gst_pad_set_caps (GST_AUDIO_ENCODER_SRC_PAD (enc), caps); + gst_caps_unref (caps); enc->header_sent = TRUE; } diff --git a/ext/vp8/GstVP8Enc.prs b/ext/vp8/GstVP8Enc.prs new file mode 100644 index 000000000..6e1d13d9b --- /dev/null +++ b/ext/vp8/GstVP8Enc.prs @@ -0,0 +1,7 @@ +[_presets_] +version=0.10 +element-name=GstVP8Enc + +[Profile Realtime] +max-latency=1 +speed=2 diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am index d839666fd..312966c6a 100644 --- a/ext/vp8/Makefile.am +++ b/ext/vp8/Makefile.am @@ -24,3 +24,8 @@ noinst_HEADERS = \ gstvp8dec.h \ gstvp8enc.h \ gstvp8utils.h + +presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets +preset_DATA = GstVP8Enc.prs + +EXTRA_DIST = $(preset_DATA) diff --git a/ext/vp8/gstvp8dec.c b/ext/vp8/gstvp8dec.c index 1172ac96e..c4d17a7b7 100644 --- a/ext/vp8/gstvp8dec.c +++ b/ext/vp8/gstvp8dec.c @@ -493,6 +493,7 @@ gst_vp8_dec_handle_frame (GstBaseVideoDecoder * decoder, } } else { /* Invisible frame */ + frame->decode_only = 1; gst_base_video_decoder_finish_frame (decoder, frame); } |