From db23c8152e5f0030fea540364ac69d5dc9cff7ab Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 15 Dec 2012 07:33:27 -0800
Subject: [PATCH] Only duplicate AVPackets as needed

Packets that don't have a destruct method are using static memory, which will
only be valid until the next av_read_frame call. Otherwise, it's already
dynamically allocated and will remain valid.
---
 apps/openmw/mwrender/videoplayer.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index e7bdfab91a..bfcb927459 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -158,14 +158,21 @@ struct VideoState {
 void PacketQueue::put(AVPacket *pkt)
 {
     AVPacketList *pkt1;
-    if(av_dup_packet(pkt) < 0)
-        throw std::runtime_error("Failed to duplicate packet");
-
     pkt1 = (AVPacketList*)av_malloc(sizeof(AVPacketList));
     if(!pkt1) throw std::bad_alloc();
     pkt1->pkt = *pkt;
     pkt1->next = NULL;
 
+    if(pkt1->pkt.destruct == NULL)
+    {
+        if(av_dup_packet(&pkt1->pkt) < 0)
+        {
+            av_free(pkt1);
+            throw std::runtime_error("Failed to duplicate packet");
+        }
+        av_free_packet(pkt);
+    }
+
     this->mutex.lock ();
 
     if(!last_pkt)