Always send frame duration using BUF_FLAG_FRAMERATE

CVS patchset: 6128
CVS date: 2004/02/09 22:24:36

19 files changed, 79 insertions, 76 deletions

diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index fe96e944a..95a6e6ab0 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -23,7 +23,7 @@
  * For more information on the 4xm file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_4xm.c,v 1.13 2004/01/09 01:26:32 miguelfreitas Exp $
+ * $Id: demux_4xm.c,v 1.14 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -402,9 +402,9 @@ static void demux_fourxm_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = this->video_pts_inc;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = this->video_pts_inc;  /* initial video_step */
   memcpy(buf->content, &this->bih, sizeof(this->bih));
   buf->size = sizeof(this->bih);
   buf->type = BUF_VIDEO_4XM;
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index e5e1e9071..de4df9114 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.147 2004/01/12 17:35:14 miguelfreitas Exp $
+ * $Id: demux_asf.c,v 1.148 2004/02/09 22:24:36 jstembridge Exp $
  *
  * demultiplexer for asf streams
  *
@@ -329,8 +329,9 @@ static void asf_send_video_header (demux_asf_t *this, int stream) {
   _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, bih->biCompression);
 
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[1] = 3000; /* FIXME ! */
+  buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                         BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = 3000; /* FIXME ! */
   memcpy (buf->content, &this->bih, this->bih_size);
   buf->size = this->bih_size;
   buf->type = this->streams[stream].buf_type ;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 6ab9005be..e3f057c38 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_avi.c,v 1.193 2004/02/02 21:32:40 tmattern Exp $
+ * $Id: demux_avi.c,v 1.194 2004/02/09 22:24:36 jstembridge Exp $
  *
  * demultiplexer for avi streams
  *
@@ -1874,8 +1874,9 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
     _x_demux_control_start (this->stream);
 
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-    buf->decoder_info[1] = this->video_step;
+    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                         BUF_FLAG_FRAME_END;
+    buf->decoder_info[0] = this->video_step;
     memcpy (buf->content, this->avi->bih, this->avi->bih->biSize);
     buf->size = this->avi->bih->biSize;
     
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 2f548b459..eb3e60c81 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.74 2004/01/09 01:26:32 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.75 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -692,9 +692,9 @@ static void demux_film_send_headers(demux_plugin_t *this_gen) {
       }
 
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-    buf->decoder_info[0] = 0;
-    buf->decoder_info[1] = initial_duration;
+    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                         BUF_FLAG_FRAME_END;
+    buf->decoder_info[0] = initial_duration;
     memcpy(buf->content, &this->bih, sizeof(this->bih));
     buf->size = sizeof(this->bih);
     buf->type = this->video_type;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 1eebd15c4..ca68adaec 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -24,7 +24,7 @@
  * avoid while programming a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_fli.c,v 1.52 2004/02/02 00:42:49 tmmm Exp $
+ * $Id: demux_fli.c,v 1.53 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -242,9 +242,9 @@ static void demux_fli_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to FLI decoder */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_FRAME_END|BUF_FLAG_STDHEADER;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = this->frame_pts_inc;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = this->frame_pts_inc;  /* initial video_step */
   buf->size = this->bih.biSize;
   memcpy(buf->content, &this->bih, sizeof(xine_bmiheader) + this->bih.biSize);
   buf->type = BUF_VIDEO_FLI;
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 09c7e47f2..4213ff3b3 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -65,7 +65,7 @@
  *     - if any bytes exceed 63, do not shift the bytes at all before
  *       transmitting them to the video decoder
  *
- * $Id: demux_idcin.c,v 1.50 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_idcin.c,v 1.51 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -369,9 +369,9 @@ static void demux_idcin_send_headers(demux_plugin_t *this_gen) {
   /* send init info to decoders */
   bih->biSize = sizeof(xine_bmiheader) + HUFFMAN_TABLE_SIZE;
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = IDCIN_FRAME_PTS_INC;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = IDCIN_FRAME_PTS_INC;  /* initial video_step */
   buf->size = bih->biSize;
   memcpy(buf->content, this->bih, buf->size);
   buf->type = BUF_VIDEO_IDCIN;
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index de0ecc7a9..e37ff8032 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -34,7 +34,7 @@
  * * ILBM (Bitmap Picturs)
  *   - simple pictures work, nothing more (most work is done in bitmap-decoder)
  *
- * $Id: demux_iff.c,v 1.5 2004/02/02 22:22:51 manfredtremmel Exp $
+ * $Id: demux_iff.c,v 1.6 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1104,9 +1104,9 @@ static void demux_iff_send_headers(demux_plugin_t *this_gen) {
       buf                               = this->video_fifo->buffer_pool_alloc(this->video_fifo);
       buf->type                         = this->video_type;
       buf->size                         = sizeof(xine_bmiheader);
-      buf->decoder_flags                = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-      buf->decoder_info[0]              = 0;
-      buf->decoder_info[1]              = this->video_pts_inc;  /* initial video_step */
+      buf->decoder_flags                = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                                          BUF_FLAG_FRAME_END;
+      buf->decoder_info[0]              = this->video_pts_inc;  /* initial video_step */
       buf->decoder_info[2]              = this->bmhd_xaspect;
       buf->decoder_info[3]              = this->bmhd_yaspect;
       memcpy(buf->content, &this->bih, sizeof(this->bih));
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index 37e75736b..d5f68ff3a 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -23,7 +23,7 @@
  * For more information regarding the Interplay MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_ipmovie.c,v 1.21 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_ipmovie.c,v 1.22 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -580,11 +580,11 @@ static void demux_ipmovie_send_headers(demux_plugin_t *this_gen) {
   /* send init info to video decoder */
   this->bih.biSize = sizeof(xine_bmiheader);
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
   /* bogus initial video_step, but we won't know for sure until we see
    * the first video frame; however, fps for these files is usually 15 */
-  buf->decoder_info[1] = 6000;
+  buf->decoder_info[0] = 6000;
   buf->size = sizeof(xine_bmiheader);
   memcpy(buf->content, &this->bih, buf->size);
   buf->type = BUF_VIDEO_INTERPLAY;
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 5dbb6fe3e..c67802921 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -23,7 +23,7 @@
  * For more information regarding the NSV file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_nsv.c,v 1.14 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_nsv.c,v 1.15 2004/02/09 22:24:36 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -378,9 +378,9 @@ static void demux_nsv_send_headers(demux_plugin_t *this_gen) {
   /* send init info to the video decoder */
   if (this->video_fifo && this->video_type) {
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-    buf->decoder_info[0] = 0;
-    buf->decoder_info[1] = this->frame_pts_inc;
+    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                         BUF_FLAG_FRAME_END;
+    buf->decoder_info[0] = this->frame_pts_inc;
     memcpy(buf->content, &this->bih, sizeof(this->bih));
     buf->size = sizeof(this->bih);
     buf->type = this->video_type;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 9bfaf10b0..fe01fa009 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.139 2004/02/03 10:36:11 andruil Exp $
+ * $Id: demux_ogg.c,v 1.140 2004/02/09 22:24:36 jstembridge Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -862,11 +862,12 @@ static void decode_video_header (demux_ogg_t *this, const int stream_num, ogg_pa
   bih.biClrImportant=0;
 
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
   this->frame_duration = loctime_unit * 9 / 1000;
   this->si[stream_num]->factor = loctime_unit * 9;
   this->si[stream_num]->quotient = 1000;
-  buf->decoder_info[1] = this->frame_duration;
+  buf->decoder_info[0] = this->frame_duration;
   memcpy (buf->content, &bih, sizeof (xine_bmiheader));
   buf->size = sizeof (xine_bmiheader);
   buf->type = this->si[stream_num]->buf_types;
@@ -1004,12 +1005,13 @@ static void decode_dshow_header (demux_ogg_t *this, const int stream_num, ogg_pa
     bih.biClrImportant  = 0;
 
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
+    buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                         BUF_FLAG_FRAME_END;
     this->frame_duration = (*(int64_t*)(op->packet+164)) * 9 / 1000;
     this->si[stream_num]->factor = (*(int64_t*)(op->packet+164)) * 9;
     this->si[stream_num]->quotient = 1000;
 
-    buf->decoder_info[1] = this->frame_duration;
+    buf->decoder_info[0] = this->frame_duration;
     memcpy (buf->content, &bih, sizeof (xine_bmiheader));
     buf->size = sizeof (xine_bmiheader);
     buf->type = this->si[stream_num]->buf_types;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index b36ac2e7f..1665a3844 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.176 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_qt.c,v 1.177 2004/02/09 22:24:36 jstembridge Exp $
  *
  */
 
@@ -2425,10 +2425,7 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) {
       (video_trak->properties->video.codec_buftype)) {
     buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
     buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-    buf->decoder_info[0] = 0;
-    /* initial video step; not necessary since each QT frame has its own
-     * duration, but set it non-zero as a matter of custom */
-    buf->decoder_info[1] = 3000;
+    
     memcpy(buf->content, &this->bih, sizeof(this->bih));
     buf->size = sizeof(this->bih);
     buf->type = video_trak->properties->video.codec_buftype;
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index dd8067e18..2505fa94b 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_rawdv.c,v 1.18 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_rawdv.c,v 1.19 2004/02/09 22:24:37 jstembridge Exp $
  *
  * demultiplexer for raw dv streams
  */
@@ -178,14 +178,15 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) {
   buf = this->video_fifo->buffer_pool_alloc(this->video_fifo);
   buf->content = buf->mem;
   buf->type = BUF_VIDEO_DV;
-  buf->decoder_flags |= BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
+  buf->decoder_flags |= BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                        BUF_FLAG_FRAME_END;
 
   bih = (xine_bmiheader *)buf->content;
 
   if( !(scratch[3] & 0x80) ) {
     /* NTSC */
     this->frame_size = NTSC_FRAME_SIZE;
-    this->duration = buf->decoder_info[1] = 3003;
+    this->duration = buf->decoder_info[0] = 3003;
     bih->biWidth = 720;
     bih->biHeight = 480;
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE,
@@ -193,7 +194,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) {
   } else {
     /* PAL */
     this->frame_size = PAL_FRAME_SIZE;
-    this->duration = buf->decoder_info[1] = 3600;
+    this->duration = buf->decoder_info[0] = 3600;
     bih->biWidth = 720;
     bih->biHeight = 576;
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE,
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 490674be2..cb4d13424 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -23,7 +23,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.50 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_roq.c,v 1.51 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -325,9 +325,9 @@ static void demux_roq_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = this->frame_pts_inc;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = this->frame_pts_inc;  /* initial video_step */
   buf->size = sizeof(xine_bmiheader);
   memcpy(buf->content, &this->bih, buf->size);
   buf->type = BUF_VIDEO_ROQ;
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 3e40576d4..d4fa0a9c1 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -23,7 +23,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.48 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_smjpeg.c,v 1.49 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -331,9 +331,9 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = 3000;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = 3000;  /* initial video_step */
   memcpy(buf->content, &this->bih, sizeof(this->bih));
   buf->size = sizeof(this->bih);
   buf->type = this->video_type;
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 612dc33f5..821e738d4 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -24,7 +24,7 @@
  * This demuxer handles either raw STR files (which are just a concatenation
  * of raw compact disc sectors) or STR files with RIFF headers.
  *
- * $Id: demux_str.c,v 1.23 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_str.c,v 1.24 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 /*
@@ -459,9 +459,9 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) {
 
 	/* send init info to video decoder */
 	buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-	buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-	buf->decoder_info[0] = 0;
-	buf->decoder_info[1] = FRAME_DURATION;  /* initial video_step */
+	buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                             BUF_FLAG_FRAME_END;
+	buf->decoder_info[0] = FRAME_DURATION;  /* initial video_step */
 	buf->size = sizeof(xine_bmiheader);
 	memcpy(buf->content, &this->bih[channel], buf->size);
 	buf->type = BUF_VIDEO_PSX_MDEC;
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index f0461a8f3..eb8c38f5f 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -28,7 +28,7 @@
  * checking the first 2 bytes, which are 0x2E 0x03 in a Sierra VMD file.
  * There is a 1/65536 chance of a false positive using this method.
  *
- * $Id: demux_vmd.c,v 1.1 2004/02/05 02:51:14 tmmm Exp $
+ * $Id: demux_vmd.c,v 1.2 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -348,9 +348,9 @@ static void demux_vmd_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = this->video_pts_inc;  /* initial duration */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = this->video_pts_inc;  /* initial duration */
   memcpy(buf->content, this->bih, sizeof(xine_bmiheader) + VMD_HEADER_SIZE);
   buf->size = sizeof(xine_bmiheader) + VMD_HEADER_SIZE;
   buf->type = BUF_VIDEO_VMD;
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 92de1539b..109aed9b9 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -29,7 +29,7 @@
  * block needs information from the previous audio block in order to be
  * decoded, thus making random seeking difficult.
  *
- * $Id: demux_vqa.c,v 1.39 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_vqa.c,v 1.40 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -269,9 +269,9 @@ static void demux_vqa_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = VQA_PTS_INC;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = VQA_PTS_INC;  /* initial video_step */
   memcpy(buf->content, this->bih, sizeof(xine_bmiheader) + VQA_HEADER_SIZE);
   buf->size = sizeof(xine_bmiheader) + VQA_HEADER_SIZE;
   buf->type = BUF_VIDEO_VQA;
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 0d75ee12b..5be5212da 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -24,7 +24,7 @@
  * For more information on the MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_wc3movie.c,v 1.50 2004/01/09 01:26:33 miguelfreitas Exp $
+ * $Id: demux_wc3movie.c,v 1.51 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -312,9 +312,9 @@ static void demux_mve_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = 0;
-  buf->decoder_info[1] = WC3_PTS_INC;  /* initial video_step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = WC3_PTS_INC;  /* initial video_step */
   buf->content = (void *)&this->bih;
   buf->size = sizeof(this->bih);
   buf->type = BUF_VIDEO_WC3;
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index d0bca8bc0..dbc55d10e 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -24,7 +24,7 @@
  * tools, visit:
  *   http://mjpeg.sourceforge.net/
  *
- * $Id: demux_yuv4mpeg2.c,v 1.35 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_yuv4mpeg2.c,v 1.36 2004/02/09 22:24:37 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -313,9 +313,10 @@ static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) {
 
   /* send init info to decoders */
   buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
-  buf->decoder_info[0] = this->progressive;
-  buf->decoder_info[1] = this->frame_pts_inc;  /* initial video step */
+  buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAMERATE|
+                       BUF_FLAG_FRAME_END;
+  buf->decoder_info[0] = this->frame_pts_inc;  /* initial video step */
+  buf->decoder_info[1] = this->progressive;
   buf->decoder_info[2] = this->top_field_first;
   if(this->aspect_n && this->aspect_d)
     buf->decoder_info[3] = this->bih.biWidth*this->aspect_n/this->aspect_d;