diff --git a/p_ac3.cpp b/p_ac3.cpp
index 7b5730af7..e70759911 100644
--- a/p_ac3.cpp
+++ b/p_ac3.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_ac3.cpp,v 1.12 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: p_ac3.cpp,v 1.13 2003/04/18 13:21:11 mosu Exp $
     \brief AC3 output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -165,7 +165,7 @@ void ac3_packetizer_c::set_header() {
 }
 
 int ac3_packetizer_c::process(unsigned char *buf, int size,
-                              int64_t timecode, int64_t) {
+                              int64_t timecode, int64_t, int64_t, int64_t) {
   unsigned char *packet;
   unsigned long header;
   ac3_header_t ac3header;
diff --git a/p_ac3.h b/p_ac3.h
index 5b5052e80..7ff3bac39 100644
--- a/p_ac3.h
+++ b/p_ac3.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_ac3.h,v 1.10 2003/04/18 10:28:14 mosu Exp $
+    \version \$Id: p_ac3.h,v 1.11 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the AC3 output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -39,7 +39,8 @@ public:
   virtual ~ac3_packetizer_c();
     
   virtual int            process(unsigned char *buf, int size,
-                                 int64_t timescode = -1, int64_t length = -1);
+                                 int64_t timecode = -1, int64_t length = -1,
+                                 int64_t bref = -1, int64_t fref = -1);
   virtual void           set_header();
     
 private:
diff --git a/p_mp3.cpp b/p_mp3.cpp
index 0f11b97b9..6840e7664 100644
--- a/p_mp3.cpp
+++ b/p_mp3.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_mp3.cpp,v 1.14 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: p_mp3.cpp,v 1.15 2003/04/18 13:21:11 mosu Exp $
     \brief MP3 output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -165,7 +165,7 @@ void mp3_packetizer_c::set_header() {
 }
 
 int mp3_packetizer_c::process(unsigned char *buf, int size,
-                              int64_t timecode, int64_t) {
+                              int64_t timecode, int64_t, int64_t, int64_t) {
   unsigned char *packet;
   unsigned long header;
   mp3_header_t mp3header;
diff --git a/p_mp3.h b/p_mp3.h
index 92805e78e..bf17cd21e 100644
--- a/p_mp3.h
+++ b/p_mp3.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_mp3.h,v 1.10 2003/04/18 10:28:14 mosu Exp $
+    \version \$Id: p_mp3.h,v 1.11 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the MP3 output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -39,7 +39,8 @@ public:
   virtual ~mp3_packetizer_c();
     
   virtual int            process(unsigned char *buf, int size,
-                                 int64_t timecode = -1, int64_t length = -1);
+                                 int64_t timecode = -1, int64_t length = -1,
+                                 int64_t bref = -1, int64_t fref = -1);
   virtual void           set_header();
 
 private:
diff --git a/p_pcm.cpp b/p_pcm.cpp
index f44d9215b..c40741f4f 100644
--- a/p_pcm.cpp
+++ b/p_pcm.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_pcm.cpp,v 1.13 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: p_pcm.cpp,v 1.14 2003/04/18 13:21:11 mosu Exp $
     \brief PCM output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -74,7 +74,7 @@ void pcm_packetizer_c::set_header() {
 }
 
 int pcm_packetizer_c::process(unsigned char *buf, int size,
-                              int64_t, int64_t) {
+                              int64_t, int64_t, int64_t, int64_t) {
   int i, bytes_per_packet, remaining_bytes, complete_packets;
   unsigned char *new_buf;
 
diff --git a/p_pcm.h b/p_pcm.h
index cfd3dc0ab..e733e74ed 100644
--- a/p_pcm.h
+++ b/p_pcm.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_pcm.h,v 1.11 2003/04/18 10:28:14 mosu Exp $
+    \version \$Id: p_pcm.h,v 1.12 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the PCM output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -39,7 +39,8 @@ public:
   virtual ~pcm_packetizer_c();
     
   virtual int  process(unsigned char *buf, int size, int64_t timecode = -1,
-                       int64_t length = -1);
+                       int64_t length = -1, int64_t bref = -1,
+                       int64_t fref = -1);
   virtual void set_header();
 };
 
diff --git a/p_textsubs.cpp b/p_textsubs.cpp
index bb63fac0a..3e46cbbc3 100644
--- a/p_textsubs.cpp
+++ b/p_textsubs.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_textsubs.cpp,v 1.5 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: p_textsubs.cpp,v 1.6 2003/04/18 13:21:11 mosu Exp $
     \brief Subripper subtitle reader
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -52,7 +52,7 @@ void textsubs_packetizer_c::set_header() {
 }
 
 int textsubs_packetizer_c::process(unsigned char *_subs, int, int64_t start,
-                                   int64_t length) {
+                                   int64_t length, int64_t, int64_t) {
   int num_newlines;
   char *subs, *idx1, *idx2, *tempbuf;
   int64_t end, duration, dlen, tmp;
diff --git a/p_textsubs.h b/p_textsubs.h
index 83f0c9277..fc7cf7584 100644
--- a/p_textsubs.h
+++ b/p_textsubs.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_textsubs.h,v 1.3 2003/04/18 10:28:14 mosu Exp $
+    \version \$Id: p_textsubs.h,v 1.4 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the simple text subtitle packetizer
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -33,8 +33,9 @@ public:
   textsubs_packetizer_c(track_info_t *nti) throw (error_c);
   virtual ~textsubs_packetizer_c();
     
-  virtual int  process(unsigned char *_subs, int size, int64_t start,
-                       int64_t length);
+  virtual int  process(unsigned char *_subs, int size, int64_t start = -1,
+                       int64_t length = -1, int64_t bref = -1,
+                       int64_t fref = -1);
   virtual void set_header();
 };
 
diff --git a/p_video.cpp b/p_video.cpp
index 8baf5a5fc..8355ecc54 100644
--- a/p_video.cpp
+++ b/p_video.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_video.cpp,v 1.22 2003/04/18 13:08:04 mosu Exp $
+    \version \$Id: p_video.cpp,v 1.23 2003/04/18 13:21:11 mosu Exp $
     \brief video output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -71,7 +71,8 @@ void video_packetizer_c::set_header() {
 }
 
 int video_packetizer_c::process(unsigned char *buf, int size,
-                                int64_t old_timecode, int64_t flags) {
+                                int64_t old_timecode, int64_t flags, int64_t,
+                                int64_t) {
   int64_t timecode;
   int num_frames;
 
diff --git a/p_video.h b/p_video.h
index 11cec9945..cf9e5ab9f 100644
--- a/p_video.h
+++ b/p_video.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_video.h,v 1.19 2003/04/18 13:08:04 mosu Exp $
+    \version \$Id: p_video.h,v 1.20 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the video output module
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -42,7 +42,8 @@ public:
   virtual ~video_packetizer_c();
     
   virtual int  process(unsigned char *buf, int size, int64_t old_timecode = -1,
-                       int64_t flags = VFT_IFRAME);
+                       int64_t flags = VFT_IFRAME, int64_t bref = -1,
+                       int64_t fref = -1);
   virtual void set_header();
 };
 
diff --git a/p_vorbis.cpp b/p_vorbis.cpp
index 10b740e89..54f6bb3f5 100644
--- a/p_vorbis.cpp
+++ b/p_vorbis.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_vorbis.cpp,v 1.11 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: p_vorbis.cpp,v 1.12 2003/04/18 13:21:11 mosu Exp $
     \brief Vorbis packetizer
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -144,7 +144,7 @@ void vorbis_packetizer_c::set_header() {
  * has to generate silence packets and put them into the Matroska file first.
  */
 int vorbis_packetizer_c::process(unsigned char *data, int size,
-                                 int64_t timecode, int64_t) {
+                                 int64_t timecode, int64_t, int64_t, int64_t) {
   unsigned char zero[2];
   ogg_packet op;
   int64_t this_bs, samples_here, samples_needed;
diff --git a/p_vorbis.h b/p_vorbis.h
index 7e5523f75..a2931e185 100644
--- a/p_vorbis.h
+++ b/p_vorbis.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: p_vorbis.h,v 1.8 2003/04/18 10:28:14 mosu Exp $
+    \version \$Id: p_vorbis.h,v 1.9 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the Vorbis packetizer
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -48,7 +48,8 @@ public:
   virtual ~vorbis_packetizer_c();
     
   virtual int  process(unsigned char *data, int size, int64_t timecode = -1,
-                       int64_t length = -1);
+                       int64_t length = -1, int64_t bref = -1,
+                       int64_t fref = -1);
   virtual void set_header();
 };
 
diff --git a/pr_generic.h b/pr_generic.h
index 325fb60db..54ee6dff1 100644
--- a/pr_generic.h
+++ b/pr_generic.h
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: pr_generic.h,v 1.22 2003/04/18 12:00:46 mosu Exp $
+    \version \$Id: pr_generic.h,v 1.23 2003/04/18 13:21:11 mosu Exp $
     \brief class definition for the generic reader and packetizer
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -78,7 +78,8 @@ public:
   virtual int64_t get_free_refs();
   virtual void set_header();
   virtual int process(unsigned char *data, int size,
-                      int64_t timecode = -1,int64_t length = -1) = 0;
+                      int64_t timecode = -1, int64_t length = -1,
+                      int64_t bref = -1, int64_t fref = -1) = 0;
 
   virtual KaxTrackEntry *get_track_entry();