Merge svn changes up to r30879

Author: Uoti Urpala

libmpdemux/demux_ogg.c

@@ -262,8 +262,9 @@ 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,float* pts,int* flags, int samplesize) {
   unsigned char* data = pack->packet;
+  int size = pack->bytes;
 
-  *pts = 0;
+  *pts = MP_NOPTS_VALUE;
   *flags = 0;
 
   if(os->vorbis) {
@@ -300,7 +301,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl
      /* header packets begin on 1-bit: thus check (*data&0x80).  We don't
 	have theora_state st, until all header packets were passed to the
 	decoder. */
-     if (!(*data&0x80))
+     if (!size || !(*data&0x80))
      {
         int keyframe_granule_shift=_ilog(os->keyframe_frequency_force-1);
         int64_t iframemask = (1 << keyframe_granule_shift) - 1;