Merge.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index eb4f7ba5a..2c06f14ca 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -233,13 +233,19 @@ static int64_t get_pts (demux_ogg_t *this, int stream_num , int64_t granulepos )
 static int read_ogg_packet (demux_ogg_t *this) {
   char *buffer;
   long bytes;
+  long total = 0;
   while (ogg_sync_pageout(&this->oy,&this->og)!=1) {
     buffer = ogg_sync_buffer(&this->oy, CHUNKSIZE);
     bytes  = this->input->read(this->input, buffer, CHUNKSIZE);
-    ogg_sync_wrote(&this->oy, bytes);
-    if (bytes < CHUNKSIZE/2) {
-      return 0;
+    if (bytes == 0) {
+      if (total == 0) {
+        printf("read_ogg_packet read nothing\n");
+        return 0;
+      }
+      break;
     }
+    ogg_sync_wrote(&this->oy, bytes);
+    total += bytes;
   }
   return 1;
 }
@@ -1346,7 +1352,6 @@ static void send_header (demux_ogg_t *this) {
 
   while (!done) {
     if (!read_ogg_packet(this)) {
-      this->status = DEMUX_FINISHED;
       return;
     }
     /* now we've got at least one new page */