From: Marten Richter <marten.richter@freenet.de>
Date: Mon, 10 Sep 2012 20:11:04 +0000 (+0200)
Subject: switch to vector in mediapackets for videoomx
X-Git-Tag: 0-4-0^2~12^2~82
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=76aef7237b9a2f465e4d3d7ef4250eb7a087866c;p=vompclient.git

switch to vector in mediapackets for videoomx
---

diff --git a/videoomx.cc b/videoomx.cc
index 63374e6..55ee466 100644
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -2310,12 +2310,11 @@ void VideoOMX::PrepareMediaSample(const MediaPacketList& mplist,UINT samplepos)
 UINT VideoOMX::DeliverMediaSample(UCHAR* buffer, UINT *samplepos)
 {
 	int consumed=0;
-	while (mediapackets.size()) {
-		MediaPacket mediapacket=mediapackets.front();
+	while (consumed<mediapackets.size()) {
+		MediaPacket mediapacket=mediapackets[consumed];
 	    DeliverMediaPacket(mediapacket, buffer, samplepos);
 	    if (*samplepos == mediapacket.length) {
 	    	*samplepos = 0;
-	    	mediapackets.pop_front();
 	    	consumed++;
 	    	//return 1;
 	    } else return consumed;
diff --git a/videoomx.h b/videoomx.h
index b4f8a42..59f0d97 100644
--- a/videoomx.h
+++ b/videoomx.h
@@ -261,7 +261,7 @@ class VideoOMX : public Video, public Thread_TYPE
    bool firstsynched;
 
     
-   MediaPacketList mediapackets;
+   vector<MediaPacket> mediapackets;
 };
 
 #endif