diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 7 | ||||
| -rw-r--r-- | src/dxr3/dxr3_decode_spu.c | 9 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 8 | ||||
| -rw-r--r-- | src/spu_dec/spu_decoder.c | 9 | ||||
| -rw-r--r-- | src/spu_dec/spudec.c | 9 | ||||
| -rw-r--r-- | src/spu_dec/spudec.h | 6 |
6 files changed, 34 insertions, 14 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index aaec97ccd..e6c44f7b5 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -298,11 +298,6 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) lprintf("lavc decoder found\n"); - /* force (width % 8 == 0), otherwise there will be - * display problems with Xv. - */ - this->bih.biWidth = (this->bih.biWidth + 1) & (~1); - this->context->width = this->bih.biWidth; this->context->height = this->bih.biHeight; this->context->stream_codec_tag = this->context->codec_tag = @@ -1366,7 +1361,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { (this->context->pix_fmt == PIX_FMT_RGB24) || (this->context->pix_fmt == PIX_FMT_PAL8)) { this->output_format = XINE_IMGFMT_YUY2; - init_yuv_planes(&this->yuv, this->bih.biWidth, this->bih.biHeight); + init_yuv_planes(&this->yuv, (this->bih.biWidth + 15) & ~15, this->bih.biHeight); this->yuv_init = 1; } this->cs_convert_init = 1; diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 7e7aa1f1a..ca2df4afd 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -51,8 +51,13 @@ #include <xine/buffer.h> #include "xine-engine/bswap.h" #ifdef HAVE_DVDNAV -# include <dvdnav/nav_types.h> -# include <dvdnav/nav_read.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# include <dvdnav/nav_read.h> +# else +# include <dvdread/nav_types.h> +# include <dvdread/nav_read.h> +# endif #else # include "nav_types.h" # include "nav_read.h" diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index e58498abd..17df441f2 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -79,7 +79,13 @@ /* DVDNAV includes */ #ifdef HAVE_DVDNAV # include <dvdnav/dvdnav.h> -# include <dvdnav/nav_read.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# include <dvdnav/nav_read.h> +# else +# include <dvdread/nav_types.h> +# include <dvdread/nav_read.h> +# endif #else # define DVDNAV_COMPILE # include "dvdnav.h" diff --git a/src/spu_dec/spu_decoder.c b/src/spu_dec/spu_decoder.c index 0b39243ae..9244564ff 100644 --- a/src/spu_dec/spu_decoder.c +++ b/src/spu_dec/spu_decoder.c @@ -38,8 +38,13 @@ #include "xine-engine/bswap.h" #include <xine/xineutils.h> #ifdef HAVE_DVDNAV -# include <dvdnav/nav_read.h> -# include <dvdnav/nav_types.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# include <dvdnav/nav_read.h> +# else +# include <dvdread/nav_types.h> +# include <dvdread/nav_read.h> +# endif #else # include "nav_read.h" # include "nav_types.h" diff --git a/src/spu_dec/spudec.c b/src/spu_dec/spudec.c index 8c5a2049d..fc305b864 100644 --- a/src/spu_dec/spudec.c +++ b/src/spu_dec/spudec.c @@ -56,8 +56,13 @@ #include <xine/buffer.h> #include "xine-engine/bswap.h" #ifdef HAVE_DVDNAV -# include <dvdnav/nav_read.h> -# include <dvdnav/nav_print.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_read.h> +# include <dvdnav/nav_print.h> +# else +# include <dvdread/nav_read.h> +# include <dvdread/nav_print.h> +# endif #else # include "nav_read.h" # include "nav_print.h" diff --git a/src/spu_dec/spudec.h b/src/spu_dec/spudec.h index 4d99e50ce..225a87f13 100644 --- a/src/spu_dec/spudec.h +++ b/src/spu_dec/spudec.h @@ -33,7 +33,11 @@ #include <xine/video_out.h> #include <xine/video_overlay.h> #ifdef HAVE_DVDNAV -# include <dvdnav/nav_types.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# else +# include <dvdread/nav_types.h> +# endif #else # include "nav_types.h" #endif |