From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 16 Dec 2010 17:55:43 +0000 (+0100)
Subject: j2kpay: handle EOC correctly
X-Git-Tag: RELEASE-0.10.27~218
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b87ec0262ba9df0d57dd3694ac12c51f3fe57e90;p=platform%2Fupstream%2Fgst-plugins-good.git

j2kpay: handle EOC correctly

Don't include the next 2 bytes when we are at the end of the data and there are
no more bytes left.
---

diff --git a/gst/rtp/gstrtpj2kpay.c b/gst/rtp/gstrtpj2kpay.c
index 7d98185..e427227 100644
--- a/gst/rtp/gstrtpj2kpay.c
+++ b/gst/rtp/gstrtpj2kpay.c
@@ -241,8 +241,8 @@ find_pu_end (GstRtpJ2KPay * pay, const guint8 * data, guint size,
             GST_LOG_OBJECT (pay, "reached next SOT at %u", offset);
             state->bitstream = FALSE;
             state->force_packet = TRUE;
-            if (marker == J2K_MARKER_EOC)
-              /* include EOC */
+            if (marker == J2K_MARKER_EOC && state->next_sot + 2 <= size)
+              /* include EOC but never go past the max size */
               return state->next_sot + 2;
             else
               return state->next_sot;