github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Code Releases Activity

in demux_ogg_read_packet initialize data to whole packet, reduces code and

Browse Source 
fixes missing initialization in else + header packet case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-03-08 22:23:21 +00:00
parent 08394d0e01
commit e078b7a14e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/demux_ogg.c
View File

@ -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)