summaryrefslogtreecommitdiff
path: root/src/libxinevdec/rgb.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-11-20 11:57:38 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-11-20 11:57:38 +0000
commit4e95a4f5224e241075b8cd86b4423c85c1d0ee26 (patch)
treecd9287e15591dce94560663ad66fc4005d006012 /src/libxinevdec/rgb.c
parent74893748b868ecc6ae539fa66e326e06947c4ac9 (diff)
downloadxine-lib-4e95a4f5224e241075b8cd86b4423c85c1d0ee26.tar.gz
xine-lib-4e95a4f5224e241075b8cd86b4423c85c1d0ee26.tar.bz2
engine modifications to allow post plugin layer:
* new public output interface xine_{audio,video}_port_t instead of xine_{ao,vo}_driver_t, old names kept as aliases for compatibility * modified the engine to allow multiple streams per output * renaming of some internal structures according to public changes * moving SCR out of per-stream-metronom into a global metronom_clock_t residing in xine_t and therefore easily available to the output layer * adapting all available plugins (note to external projects: the compiler will help you a lot, if a plugin compiles, it is adapted, because all changes add new parameters to some functions) * bump up all interface versions because of xine_t and xine_stream_t changes CVS patchset: 3312 CVS date: 2002/11/20 11:57:38
Diffstat (limited to 'src/libxinevdec/rgb.c')
-rw-r--r--src/libxinevdec/rgb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index ff7ba044c..510108383 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.11 2002/11/12 18:40:54 miguelfreitas Exp $
+ * $Id: rgb.c,v 1.12 2002/11/20 11:57:47 mroi Exp $
*/
#include <stdio.h>
@@ -99,7 +99,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
- this->stream->video_out->open (this->stream->video_out);
+ this->stream->video_out->open (this->stream->video_out, this->stream);
if(this->buf)
free(this->buf);
@@ -119,7 +119,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
init_yuv_planes(&this->yuv_planes, this->width, this->height);
- this->stream->video_out->open (this->stream->video_out);
+ this->stream->video_out->open (this->stream->video_out, this->stream);
this->decoder_ok = 1;
/* load the stream/meta info */
@@ -213,7 +213,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
}
- img->draw(img);
+ img->draw(img, this->stream);
img->free(img);
this->size = 0;
@@ -253,7 +253,7 @@ static void rgb_dispose (video_decoder_t *this_gen) {
if (this->decoder_ok) {
this->decoder_ok = 0;
- this->stream->video_out->close(this->stream->video_out);
+ this->stream->video_out->close(this->stream->video_out, this->stream);
}
free (this_gen);
@@ -323,6 +323,6 @@ static decoder_info_t dec_info_video = {
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_DECODER, 12, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin },
+ { PLUGIN_VIDEO_DECODER, 13, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};