Don't append 'BUF_FLAG_SPECIAL' packets to frame data

CVS patchset: 3586
CVS date: 2002/12/18 21:35:41

10 files changed, 19 insertions, 19 deletions

diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 706debe34..c031d57fb 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.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: xine_decoder.c,v 1.79 2002/12/17 00:30:07 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.80 2002/12/18 21:35:41 esnel Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -830,7 +830,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
     this->decoder_ok = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (!this->output_open) {
       this->output_open = this->stream->audio_out->open(this->stream->audio_out,
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index a95679877..6e3bb57c4 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.c
@@ -18,7 +18,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: cyuv.c,v 1.13 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: cyuv.c,v 1.14 2002/12/18 21:35:41 esnel Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -145,7 +145,7 @@ static void cyuv_decode_data (video_decoder_t *this_gen,
   cyuv_decoder_t *this = (cyuv_decoder_t *) this_gen;
   vo_frame_t *img; /* video out frame */
 
-  if (buf->decoder_flags & BUF_FLAG_PREVIEW)
+  if (buf->decoder_flags & (BUF_FLAG_PREVIEW | BUF_FLAG_SPECIAL))
     return;
 
   if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index 84c25fd2e..7be5c88d7 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
  * For more information on the MS RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: msrle.c,v 1.12 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: msrle.c,v 1.13 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -229,7 +229,7 @@ static void msrle_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index dbcae4088..4d49b5bf4 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.19 2002/12/18 19:48:51 esnel Exp $
+ * $Id: msvc.c,v 1.20 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdlib.h>
diff --git a/src/libxinevdec/qtrle.c b/src/libxinevdec/qtrle.c
index 0deb4c3a4..e02b59ced 100644
--- a/src/libxinevdec/qtrle.c
+++ b/src/libxinevdec/qtrle.c
@@ -21,7 +21,7 @@
  * For more information on the QT RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtrle.c,v 1.8 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: qtrle.c,v 1.9 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -731,7 +731,7 @@ static void qtrle_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index 140ac1a52..115e4f729 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
  * For more information about the RPZA format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: qtrpza.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: qtrpza.c,v 1.11 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -323,7 +323,7 @@ static void qtrpza_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index e35e14d27..8e1a78cec 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
  * For more information on the SMC format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtsmc.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: qtsmc.c,v 1.11 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -555,7 +555,7 @@ static void qtsmc_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index de392759d..addf45efe 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just converts a raw RGB image to a YUY2 map
  * suitable for display under xine.
  * 
- * $Id: rgb.c,v 1.13 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: rgb.c,v 1.14 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -127,7 +127,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c
index 593f77f7f..9437f9325 100644
--- a/src/libxinevdec/svq1.c
+++ b/src/libxinevdec/svq1.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: svq1.c,v 1.16 2002/12/15 16:15:25 esnel Exp $
+ * $Id: svq1.c,v 1.17 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -1287,7 +1287,7 @@ static void svq1dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
     this->stream->meta_info[XINE_META_INFO_VIDEOCODEC] = strdup("Sorenson Video 1");
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
     
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 1c3e85fbb..0eb95327d 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
  * 
- * $Id: yuv.c,v 1.15 2002/12/06 01:44:06 miguelfreitas Exp $
+ * $Id: yuv.c,v 1.16 2002/12/18 21:35:42 esnel Exp $
  */
 
 #include <stdio.h>
@@ -120,7 +120,7 @@ static void yuv_decode_data (video_decoder_t *this_gen,
     this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
 
     return;
-  } else if (this->decoder_ok) {
+  } else if (this->decoder_ok && !(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 
     if (this->size + buf->size > this->bufsize) {
       this->bufsize = this->size + 2 * buf->size;