summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-14 17:00:16 (UTC)
committer simon <simon>2002-12-14 17:00:16 (UTC)
commitbbdeff25bd0cc5ff59d52fd8bf25cdfbeac8f251 (patch) (unidiff)
tree6357471675db58fbf6d1d9d168618635c2e5cbf6
parent354b07f236773c0dbb642972a7dffb598ea1af2f (diff)
downloadopie-bbdeff25bd0cc5ff59d52fd8bf25cdfbeac8f251.zip
opie-bbdeff25bd0cc5ff59d52fd8bf25cdfbeac8f251.tar.gz
opie-bbdeff25bd0cc5ff59d52fd8bf25cdfbeac8f251.tar.bz2
- skip the free_(audio|video)_decoder calls. today's libvorbis doesn't
like it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index e2eb663..a49f9d3 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -579,57 +579,57 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) {
579 this->yuv2rgb_mode = MODE_24_BGR; 579 this->yuv2rgb_mode = MODE_24_BGR;
580 }; 580 };
581 break; 581 break;
582 case 16: 582 case 16:
583 if( rgb == 0 ) { 583 if( rgb == 0 ) {
584 this->yuv2rgb_mode = MODE_16_RGB; 584 this->yuv2rgb_mode = MODE_16_RGB;
585 } else { 585 } else {
586 this->yuv2rgb_mode = MODE_16_BGR; 586 this->yuv2rgb_mode = MODE_16_BGR;
587 } 587 }
588 break; 588 break;
589 case 15: 589 case 15:
590 if( rgb == 0 ) { 590 if( rgb == 0 ) {
591 this->yuv2rgb_mode = MODE_15_RGB; 591 this->yuv2rgb_mode = MODE_15_RGB;
592 } else { 592 } else {
593 this->yuv2rgb_mode = MODE_15_BGR; 593 this->yuv2rgb_mode = MODE_15_BGR;
594 } 594 }
595 break; 595 break;
596 case 8: 596 case 8:
597 if( rgb == 0 ) { 597 if( rgb == 0 ) {
598 this->yuv2rgb_mode = MODE_8_RGB; 598 this->yuv2rgb_mode = MODE_8_RGB;
599 } else { 599 } else {
600 this->yuv2rgb_mode = MODE_8_BGR; 600 this->yuv2rgb_mode = MODE_8_BGR;
601 } 601 }
602 break; 602 break;
603 }; 603 };
604 //free(this->yuv2rgb_factory ); 604 //free(this->yuv2rgb_factory );
605 // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, 605 // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap,
606 // this->yuv2rgb_cmap); 606 // this->yuv2rgb_cmap);
607}; 607};
608 608
609void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, 609void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t,
610 void* user_data ) { 610 void* user_data ) {
611 null_driver_t* this = (null_driver_t*) self->driver; 611 null_driver_t* this = (null_driver_t*) self->driver;
612 this->caller = user_data; 612 this->caller = user_data;
613 this->frameDis = t; 613 this->frameDis = t;
614} 614}
615 615
616void null_preload_decoders( xine_stream_t *stream ) 616void null_preload_decoders( xine_stream_t *stream )
617{ 617{
618 static const uint32_t preloadedAudioDecoders[] = { BUF_AUDIO_MPEG, BUF_AUDIO_VORBIS }; 618 static const uint32_t preloadedAudioDecoders[] = { BUF_AUDIO_MPEG, BUF_AUDIO_VORBIS };
619 static const uint8_t preloadedAudioDecoderCount = sizeof( preloadedAudioDecoders ) / sizeof( preloadedAudioDecoders[ 0 ] ); 619 static const uint8_t preloadedAudioDecoderCount = sizeof( preloadedAudioDecoders ) / sizeof( preloadedAudioDecoders[ 0 ] );
620 static const uint32_t preloadedVideoDecoders[] = { BUF_VIDEO_MPEG, BUF_VIDEO_MPEG4, BUF_VIDEO_DIVX5 }; 620 static const uint32_t preloadedVideoDecoders[] = { BUF_VIDEO_MPEG, BUF_VIDEO_MPEG4, BUF_VIDEO_DIVX5 };
621 static const uint8_t preloadedVideoDecoderCount = sizeof( preloadedVideoDecoders ) / sizeof( preloadedVideoDecoders[ 0 ] ); 621 static const uint8_t preloadedVideoDecoderCount = sizeof( preloadedVideoDecoders ) / sizeof( preloadedVideoDecoders[ 0 ] );
622 622
623 uint8_t i; 623 uint8_t i;
624 624
625 for ( i = 0; i < preloadedAudioDecoderCount; ++i ) { 625 for ( i = 0; i < preloadedAudioDecoderCount; ++i ) {
626 audio_decoder_t *decoder = get_audio_decoder( stream, ( preloadedAudioDecoders[ i ] >> 16 ) & 0xff ); 626 audio_decoder_t *decoder = get_audio_decoder( stream, ( preloadedAudioDecoders[ i ] >> 16 ) & 0xff );
627 free_audio_decoder( stream, decoder ); 627/* free_audio_decoder( stream, decoder ); */
628 } 628 }
629 629
630 for ( i = 0; i < preloadedVideoDecoderCount; ++i ) { 630 for ( i = 0; i < preloadedVideoDecoderCount; ++i ) {
631 video_decoder_t *decoder = get_video_decoder( stream, ( preloadedVideoDecoders[ i ] >> 16 ) & 0xff ); 631 video_decoder_t *decoder = get_video_decoder( stream, ( preloadedVideoDecoders[ i ] >> 16 ) & 0xff );
632 free_video_decoder( stream, decoder ); 632/* free_video_decoder( stream, decoder ); */
633 } 633 }
634} 634}
635 635