summaryrefslogtreecommitdiff
path: root/src/video_out
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/video_out
parent972525259631802d6cc970a0e02e017777c42943 (diff)
downloadxine-lib-6cad9134463bc234e64805d38afe6a20b52877df.tar.gz
xine-lib-6cad9134463bc234e64805d38afe6a20b52877df.tar.bz2
color_matrix: recognize cropped letterbox HD (eg 1280x540)
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/color_matrix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_out/color_matrix.c b/src/video_out/color_matrix.c
index 7047559ad..f807a0e92 100644
--- a/src/video_out/color_matrix.c
+++ b/src/video_out/color_matrix.c
@@ -166,7 +166,8 @@ static int cm_from_frame (vo_frame_t *frame) {
int cm = VO_GET_FLAGS_CM (frame->flags);
int cf = this->cm_state;
- cm_m[10] = (frame->height - frame->crop_top - frame->crop_bottom) >= 720 ? 1 : 5;
+ cm_m[10] = (frame->height - frame->crop_top - frame->crop_bottom >= 720) ||
+ (frame->width - frame->crop_left - frame->crop_right >= 1280) ? 1 : 5;
cm_r[0] = cm & 1;
return ((cm_m[((cf >> 2) << 3) | (cm >> 1)] << 1) | cm_r[cf & 2]);
}