diff options
| -rw-r--r-- | .hgsigs | 1 | ||||
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | src/video_dec/yuv.c | 11 |
3 files changed, 11 insertions, 2 deletions
@@ -22,3 +22,4 @@ acba7a8c29cca74b112c2c6db4310ddeb1524696 0 iD8DBQBPSokrsBKtjPGfWZ8RAmajAKCe/oPgS 342128b2fcf59bfe8844b282a228581aa8bbbbde 0 iD8DBQBPSokwsBKtjPGfWZ8RAmo0AKDHz2T3y4gD3kVfIyilXltO/F7dVwCgxGCtufhxSoMA10HTIpUvqLI3INg= dde68fe11b973767f0b743ced2b41a244e1e0b78 0 iD8DBQBPSokzsBKtjPGfWZ8RAlZZAJ9wLB2jL+oQBohbv45Dp2nvVyRrMgCcCtg4omZNCMxbLHXt8p015OU+vj8= c3293ab97f3242d2e16548e0a3ce2d72cdfeb6e6 0 iD8DBQBP046tsBKtjPGfWZ8RAlklAKCCzTzxEEQyxzWPFUS5YEyWUtkKkACgxeYIqB4HgTfHr4sYq5F/MwFzPpY= +948bb6010a3e36f1f555fd6215e3db638e8c0b30 0 iD8DBQBP046nsBKtjPGfWZ8RAjcmAKCz5W1Voa6avUbB8N5GGqVrZbZP1ACgtsqN2yfBwgHE+KGc74nA8U3CSvU= @@ -161,6 +161,7 @@ ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17 acba7a8c29cca74b112c2c6db4310ddeb1524696 1.1.19 342128b2fcf59bfe8844b282a228581aa8bbbbde 1.1.20 dde68fe11b973767f0b743ced2b41a244e1e0b78 1.1.20.1 +948bb6010a3e36f1f555fd6215e3db638e8c0b30 1.1.21 01846b148cbaa03141bae2e51f8d9df00a2843fb 1.2.0 ac2c5ea4bc52322c176c2e601a36c298091bfc9b 1.2.1 c3293ab97f3242d2e16548e0a3ce2d72cdfeb6e6 1.2.2 diff --git a/src/video_dec/yuv.c b/src/video_dec/yuv.c index c1a8b1829..b9f4b43f4 100644 --- a/src/video_dec/yuv.c +++ b/src/video_dec/yuv.c @@ -97,8 +97,8 @@ static void yuv_decode_data (video_decoder_t *this_gen, (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; - this->width = (bih->biWidth + 3) & ~0x03; - this->height = (bih->biHeight + 3) & ~0x03; + this->width = bih->biWidth; + this->height = bih->biHeight; if (buf->decoder_flags & BUF_FLAG_ASPECT) this->ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2]; @@ -121,14 +121,19 @@ static void yuv_decode_data (video_decoder_t *this_gen, switch (buf->type) { case BUF_VIDEO_YUY2: + this->width = (this->width + 1) & ~1; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YUY2"); break; case BUF_VIDEO_YV12: + this->width = (this->width + 1) & ~1; + this->height = (this->height + 1) & ~1; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12"); break; case BUF_VIDEO_YVU9: + this->width = (this->width + 3) & ~3; + this->height = (this->height + 3) & ~3; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9"); break; @@ -137,6 +142,8 @@ static void yuv_decode_data (video_decoder_t *this_gen, break; case BUF_VIDEO_I420: + this->width = (this->width + 1) & ~1; + this->height = (this->height + 1) & ~1; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420"); break; |