mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

*.*: Ran scripts/update-macros. Oh yes.

Browse source 
Original commit message from CVS:
2005-11-21  Andy Wingo  <wingo@pobox.com>

* *.h:
* *.c: Ran scripts/update-macros. Oh yes.
This commit is contained in:
Andy Wingo 2005-11-21 16:37:18 +00:00
parent 4efb953270
commit ee89b19c7a
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-11-21 Andy Wingo <wingo@pobox.com>
* *.h:
* *.c: Ran scripts/update-macros. Oh yes.
2005-11-21 Tim-Philipp Müller <tim at centricular dot net> 2005-11-21 Tim-Philipp Müller <tim at centricular dot net>
* ext/directfb/dfbvideosink.c: * ext/directfb/dfbvideosink.c:

20
ext/faac/gstfaac.c
View file

@ -289,7 +289,7 @@ gst_faac_sink_setcaps (GstPad * pad, GstCaps * caps)
if (!gst_caps_is_fixed (caps)) if (!gst_caps_is_fixed (caps))
goto done; goto done;
GST_LOCK (faac); GST_OBJECT_LOCK (faac);
if (faac->handle) { if (faac->handle) {
faacEncClose (faac->handle); faacEncClose (faac->handle);
faac->handle = NULL; faac->handle = NULL;
@ -298,7 +298,7 @@ gst_faac_sink_setcaps (GstPad * pad, GstCaps * caps)
gst_buffer_unref (faac->cache); gst_buffer_unref (faac->cache);
faac->cache = NULL; faac->cache = NULL;
} }
GST_UNLOCK (faac); GST_OBJECT_UNLOCK (faac);
if (!gst_structure_get_int (structure, "channels", &channels) || if (!gst_structure_get_int (structure, "channels", &channels) ||
!gst_structure_get_int (structure, "rate", &samplerate)) { !gst_structure_get_int (structure, "rate", &samplerate)) {
@ -333,7 +333,7 @@ gst_faac_sink_setcaps (GstPad * pad, GstCaps * caps)
goto done; goto done;
} }
GST_LOCK (faac); GST_OBJECT_LOCK (faac);
faac->format = fmt; faac->format = fmt;
faac->bps = bps; faac->bps = bps;
faac->handle = handle; faac->handle = handle;
@ -341,7 +341,7 @@ gst_faac_sink_setcaps (GstPad * pad, GstCaps * caps)
faac->samples = samples; faac->samples = samples;
faac->channels = channels; faac->channels = channels;
faac->samplerate = samplerate; faac->samplerate = samplerate;
GST_UNLOCK (faac); GST_OBJECT_UNLOCK (faac);
result = TRUE; result = TRUE;
@ -622,7 +622,7 @@ gst_faac_set_property (GObject * object,
{ {
GstFaac *faac = GST_FAAC (object); GstFaac *faac = GST_FAAC (object);
GST_LOCK (faac); GST_OBJECT_LOCK (faac);
switch (prop_id) { switch (prop_id) {
case ARG_BITRATE: case ARG_BITRATE:
@ -648,7 +648,7 @@ gst_faac_set_property (GObject * object,
break; break;
} }
GST_UNLOCK (faac); GST_OBJECT_UNLOCK (faac);
} }
static void static void
@ -657,7 +657,7 @@ gst_faac_get_property (GObject * object,
{ {
GstFaac *faac = GST_FAAC (object); GstFaac *faac = GST_FAAC (object);
GST_LOCK (faac); GST_OBJECT_LOCK (faac);
switch (prop_id) { switch (prop_id) {
case ARG_BITRATE: case ARG_BITRATE:
@ -683,7 +683,7 @@ gst_faac_get_property (GObject * object,
break; break;
} }
GST_UNLOCK (faac); GST_OBJECT_UNLOCK (faac);
} }
static GstStateChangeReturn static GstStateChangeReturn
@ -704,7 +704,7 @@ gst_faac_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
{ {
GST_LOCK (faac); GST_OBJECT_LOCK (faac);
if (faac->handle) { if (faac->handle) {
faacEncClose (faac->handle); faacEncClose (faac->handle);
faac->handle = NULL; faac->handle = NULL;
@ -717,7 +717,7 @@ gst_faac_change_state (GstElement * element, GstStateChange transition)
faac->cache_duration = 0; faac->cache_duration = 0;
faac->samplerate = -1; faac->samplerate = -1;
faac->channels = -1; faac->channels = -1;
GST_UNLOCK (faac); GST_OBJECT_UNLOCK (faac);
break; break;
} }
default: default: