diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2004-02-09 22:04:11 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2004-02-09 22:04:11 +0000 |
| commit | 37b34df0b811fbd7e0a4b39dd4a7fe2fd3e37756 (patch) | |
| tree | b72f943db9e7a45c28d8673859c88be1030e5b19 /src/libxinevdec/bitplane.c | |
| parent | f32ff1b1bdf6d7362e254e6a53e1efe8f51d0547 (diff) | |
| download | xine-lib-37b34df0b811fbd7e0a4b39dd4a7fe2fd3e37756.tar.gz xine-lib-37b34df0b811fbd7e0a4b39dd4a7fe2fd3e37756.tar.bz2 | |
Only read frame duration when BUF_FLAG_FRAMERATE is set
CVS patchset: 6125
CVS date: 2004/02/09 22:04:11
Diffstat (limited to 'src/libxinevdec/bitplane.c')
| -rw-r--r-- | src/libxinevdec/bitplane.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 71103dedf..cbc78760a 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -22,7 +22,7 @@ * suitable for display under xine. It's based on the rgb-decoder * and the development documentation from the Amiga Developer CD * - * $Id: bitplane.c,v 1.1 2004/02/02 22:22:52 manfredtremmel Exp $ + * $Id: bitplane.c,v 1.2 2004/02/09 22:04:11 jstembridge Exp $ */ #include <stdio.h> @@ -155,6 +155,11 @@ static void bitplane_decode_data (video_decoder_t *this_gen, return; } + + if (buf->decoder_flags & BUF_FLAG_FRAMERATE) { + this->video_step = buf->decoder_info[0]; + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step); + } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ this->stream->video_out->open (this->stream->video_out, this->stream); @@ -167,7 +172,6 @@ static void bitplane_decode_data (video_decoder_t *this_gen, this->width_decode = (bih->biWidth + 15) & ~0x0f; this->height = bih->biHeight; this->ratio = (double)this->width/(double)this->height; - this->video_step = buf->decoder_info[1]; /* Palette based Formates use up to 8 Bit per pixel, always use 8 Bit if less */ this->bytes_per_pixel = (bih->biBitCount + 1) / 8; if( this->bytes_per_pixel < 1 ) @@ -230,9 +234,6 @@ static void bitplane_decode_data (video_decoder_t *this_gen, this->size += buf->size; - if (buf->decoder_flags & BUF_FLAG_FRAMERATE) - this->video_step = buf->decoder_info[0]; - if (buf->decoder_flags & BUF_FLAG_FRAME_END) { img = this->stream->video_out->get_frame (this->stream->video_out, |