diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 22:23:21 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 22:23:21 +0000 |
| commit | e078b7a14e91a703ff703139efbf163c1245ba48 (patch) | |
| tree | 42deb4ee596dec169d1addcdbc6ee79021b31790 /libmpdemux | |
| parent | 08394d0e018ae5782692faf8841187e58ecee524 (diff) | |
| download | mpv-e078b7a14e91a703ff703139efbf163c1245ba48.tar.bz2 mpv-e078b7a14e91a703ff703139efbf163c1245ba48.tar.xz | |
in demux_ogg_read_packet initialize data to whole packet, reduces code and
fixes missing initialization in else + header packet case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index aa91b5bee7..459d4a4461 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -330,13 +330,12 @@ static int demux_ogg_get_page_stream(ogg_demuxer_t* ogg_d,ogg_stream_state** os } static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,void *context,float* pts,int* flags, int samplesize) { - unsigned char* data; + unsigned char* data = pack->packet; *pts = 0; *flags = 0; if(os->vorbis) { - data = pack->packet; if(*pack->packet & PACKET_TYPE_HEADER) os->hdr_packets++; else if (context ) @@ -356,11 +355,10 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vo os->lastpos = pack->granulepos; } } else if (os->speex) { - data = pack->packet; + // whole packet (default) # ifdef HAVE_OGGTHEORA } else if (os->theora) { /* we pass complete packets to theora, mustn't strip the header! */ - data = pack->packet; os->lastsize = 1; /* header packets beginn on 1-bit: thus check (*data&0x80). We don't @@ -389,7 +387,6 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vo # ifdef HAVE_FLAC } else if (os->flac) { /* we pass complete packets to flac, mustn't strip the header! */ - data = pack->packet; #endif /* HAVE_FLAC */ } else { if(*pack->packet & PACKET_TYPE_HEADER) |