From ec820113409b8a755715129ecb43e775c68cfd3a Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Thu, 6 Feb 2003 22:34:55 +0000
Subject: DV packet copy fix by Roman Shaposhnick

Originally committed as revision 1548 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/dv.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'libavformat/dv.c')

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 64cc0bef1b..c08bc05162 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -53,7 +53,12 @@ static int dv_read_header(AVFormatContext *s,
     return 0;
 }
 
-/* XXX: build fake audio stream when DV audio decoder will be finished */
+static void __destruct_pkt(struct AVPacket *pkt)
+{
+    pkt->data = NULL; pkt->size = 0;
+    return;
+}
+
 static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, dsf;
@@ -74,13 +79,14 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
 	    return -EIO;
     }
     
-    if (av_new_packet(pkt, c->size) < 0)
-        return -EIO;
-
+    av_init_packet(pkt);
+    pkt->destruct = __destruct_pkt;
+    pkt->data     = c->buf;
+    pkt->size     = c->size;
     pkt->stream_index = c->is_audio;
+    
     c->is_audio = !c->is_audio;
-    memcpy(pkt->data, c->buf, c->size);
-    return ret;
+    return c->size;
 }
 
 static int dv_read_close(AVFormatContext *s)
-- 
cgit v1.2.3