diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-04-04 02:07:15 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-04-04 02:07:15 +0000 |
| commit | d76f581ff512c73c57fb417eda6ea19685bff69c (patch) | |
| tree | 8e837bed3b9c239eeaaf269cc74ee69b4f2e6fa0 /libavformat/ogg.c | |
| parent | 8bfed902f30f2c1c2c7e3e6f85bb44c42127dea3 (diff) | |
| download | ffmpeg-d76f581ff512c73c57fb417eda6ea19685bff69c.tar.gz | |
kill obnoxious ogg_packet passing from demuxer to decoder
Originally committed as revision 2953 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ogg.c')
| -rw-r--r-- | libavformat/ogg.c | 7 |
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; } |