summaryrefslogtreecommitdiff
path: root/gst/nuvdemux
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2007-01-03 16:41:10 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-01-03 16:41:10 +0000
commit9b1bffb45607c0cdfc80d1c856d331789789cd34 (patch)
treef1ffdcd24a18e07ee8d15bbfe4deabafd152cf61 /gst/nuvdemux
parent2d4cbb090c60ed78e14c1a6e226c678570f4200a (diff)
Fix build with gcc-2.x (declare variables at the beginning of a block etc.). Fixes #391971.
Original commit message from CVS: Patch by: Jens Granseuer <jensgr at gmx net> * ext/xvid/gstxvidenc.c: (gst_xvidenc_encode), (gst_xvidenc_get_property): * gst/filter/gstbpwsinc.c: (bpwsinc_transform_ip): * gst/filter/gstfilter.c: (plugin_init): * gst/filter/gstiir.c: (iir_transform_ip): * gst/filter/gstlpwsinc.c: (lpwsinc_transform_ip): * gst/modplug/gstmodplug.cc: * gst/nuvdemux/gstnuvdemux.c: (gst_nuv_demux_header_load), (gst_nuv_demux_stream_extend_header): Fix build with gcc-2.x (declare variables at the beginning of a block etc.). Fixes #391971.
Diffstat (limited to 'gst/nuvdemux')
-rw-r--r--gst/nuvdemux/gstnuvdemux.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c
index 768af1ee2..bf6275700 100644
--- a/gst/nuvdemux/gstnuvdemux.c
+++ b/gst/nuvdemux/gstnuvdemux.c
@@ -231,12 +231,14 @@ static GstFlowReturn
gst_nuv_demux_header_load (GstNuvDemux * nuv, nuv_header ** h_ret)
{
GstBuffer *buffer = NULL;
- GstFlowReturn res = gst_nuv_demux_read_bytes (nuv, 72, TRUE, &buffer);
+ GstFlowReturn res;
+ nuv_header *h;
+ res = gst_nuv_demux_read_bytes (nuv, 72, TRUE, &buffer);
if (res != GST_FLOW_OK)
return res;
- nuv_header *h = g_new0 (nuv_header, 1);
+ h = g_new0 (nuv_header, 1);
memcpy (h->id, buffer->data, 12);
memcpy (h->version, buffer->data + 12, 5);
@@ -622,9 +624,10 @@ gst_nuv_demux_stream_extend_header (GstNuvDemux * nuv)
}
if (buf->data[0] == 'X') {
+ nuv_frame_header *h = NULL;
+
gst_buffer_unref (buf);
buf = NULL;
- nuv_frame_header *h = NULL;
res = gst_nuv_demux_frame_header_load (nuv, &h);
if (res != GST_FLOW_OK)