From d76f581ff512c73c57fb417eda6ea19685bff69c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 4 Apr 2004 02:07:15 +0000 Subject: kill obnoxious ogg_packet passing from demuxer to decoder Originally committed as revision 2953 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/ogg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavformat') 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; } -- cgit v1.2.3