kill obnoxious ogg_packet passing from demuxer to decoder

Originally committed as revision 2953 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 3 insertions, 4 deletions

diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index b3cc68bb9a..ed5bc3f56c 100644
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -226,13 +226,12 @@ static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
 
     if(next_packet(avfcontext, &op)) 
 	return -EIO ;
-    if(av_new_packet(pkt, sizeof(ogg_packet) + op.bytes) < 0)
+    if(av_new_packet(pkt, op.bytes) < 0)
 	return -EIO ;
     pkt->stream_index = 0 ;
-    memcpy(pkt->data, &op, sizeof(ogg_packet)) ;
-    memcpy(pkt->data + sizeof(ogg_packet), op.packet, op.bytes) ;
+    memcpy(pkt->data, op.packet, op.bytes);
 
-    return sizeof(ogg_packet) + op.bytes ;
+    return op.bytes;
 }