summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorTorsten Jager <t.jager@gmx.de>2012-08-29 09:38:24 +0300
committerTorsten Jager <t.jager@gmx.de>2012-08-29 09:38:24 +0300
commit6cad9134463bc234e64805d38afe6a20b52877df (patch)
tree2cac21748104a542092bd6fee9a257323abbb369 /src/xine-engine
parent972525259631802d6cc970a0e02e017777c42943 (diff)
downloadxine-lib-6cad9134463bc234e64805d38afe6a20b52877df.tar.gz
xine-lib-6cad9134463bc234e64805d38afe6a20b52877df.tar.bz2
color_matrix: recognize cropped letterbox HD (eg 1280x540)
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/video_out.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index c934578ce..4fc54e922 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -544,7 +544,9 @@ static int vo_grab_grab_video_frame (xine_grab_video_frame_t *frame_gen) {
return -1; /* error happened */
}
if ((cm >> 1) == 2) /* color matrix undefined */
- cm = (cm & 1) | (vo_frame->height - vo_frame->crop_top - vo_frame->crop_bottom >= 720 ? 2 : 10);
+ cm = (cm & 1) |
+ ((vo_frame->height - vo_frame->crop_top - vo_frame->crop_bottom >= 720) ||
+ (vo_frame->width - vo_frame->crop_left - vo_frame->crop_right >= 1280) ? 2 : 10);
else if ((cm >> 1) == 0) /* converted RGB source, always ITU 601 */
cm = (cm & 1) | 10;
frame->yuv2rgb_factory->set_csc_levels (frame->yuv2rgb_factory, 0, 128, 128, cm);