From 2f016f3f9dd4c3bbf5f5de24ab2e866466bb7a3b Mon Sep 17 00:00:00 2001 From: Jimmy Ohn Date: Mon, 6 Jul 2015 19:11:00 +0900 Subject: [PATCH] rtph261pay: Fix uninitialized variable compiler error endpos variable does not correctly understand in the 4.6.3 GCC version. So compile error appears when we do compile rtph261pay using jhbuild. This patch is fixed the compile error in 4.6.3 GCC version. https://bugzilla.gnome.org/show_bug.cgi?id=751985 --- gst/rtp/gstrtph261pay.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gst/rtp/gstrtph261pay.c b/gst/rtp/gstrtph261pay.c index 98b2fc2bd6..4c43cfcf3f 100644 --- a/gst/rtp/gstrtph261pay.c +++ b/gst/rtp/gstrtph261pay.c @@ -668,23 +668,18 @@ parse_mb_until_pos (GstRtpH261Pay * pay, GstBitReader * br, Gob * gob, gint count = 0; gboolean stop = FALSE; guint maxpos = *endpos; + Macroblock mb; GST_LOG_OBJECT (pay, "Parse until pos %u, start at pos %u, gobn %d, mba %d", maxpos, gst_bit_reader_get_pos (br), gob->gn, gob->last.mba); while (!stop) { - Macroblock mb; - ret = parse_mb (pay, br, &gob->last, &mb); switch (ret) { case PARSE_OK: if (mb.endpos > maxpos && count > 0) { /* Don't include current MB */ - GST_DEBUG_OBJECT (pay, - "Split GOBN %d after MBA %d (endpos %u, maxpos %u, nextpos %u)", - gob->gn, gob->last.mba, *endpos, maxpos, mb.endpos); - gst_bit_reader_set_pos (br, *endpos); stop = TRUE; } else { /* Update to include current MB */ @@ -724,6 +719,13 @@ parse_mb_until_pos (GstRtpH261Pay * pay, GstBitReader * br, Gob * gob, } gob->last.gobn = gob->gn; + if(ret == PARSE_OK) { + GST_DEBUG_OBJECT (pay, + "Split GOBN %d after MBA %d (endpos %u, maxpos %u, nextpos %u)", + gob->gn, gob->last.mba, *endpos, maxpos, mb.endpos); + gst_bit_reader_set_pos (br, *endpos); + } + return ret; }