---

yaml
---
r: 65791
b: refs/heads/master
c: d2a35fb
h: refs/heads/master
i:
  65789: 208ad70
  65787: 288859c
  65783: 53749ff
  65775: 0d05c36
  65759: 0e7bf2c
  65727: b364090
  65663: edc18e1
  65535: 9f7407a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01f1e44fe8455b6c6c557a62119b8622fb99f5f2
+refs/heads/master: d2a35fb172845fe75c40a3ee9c95656c7c115e48

trunk/drivers/media/video/ivtv/ivtv-ioctl.c

@@ -1270,14 +1270,22 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 				"Global and Local"
 			};
 			static const char * const pixel_format[] = {
-				"Indexed",
+				"RGB Indexed",
 				"RGB 5:6:5",
 				"ARGB 1:5:5:5",
 				"ARGB 1:4:4:4",
 				"ARGB 8:8:8:8",
 				"5",
 				"6",
 				"7",
+				"YUV Indexed",
+				"YUV 5:6:5",
+				"AYUV 1:5:5:5",
+				"AYUV 1:4:4:4",
+				"AYUV 8:8:8:8",
+				"13",
+				"14",
+				"15",
 			};
 
 			ivtv_get_output(itv, itv->active_output, &vidout);
@@ -1290,10 +1298,11 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 				mode = OUT_NONE;
 			IVTV_INFO("Output Mode:  %s\n", output_modes[mode]);
 			ivtv_vapi_result(itv, data, CX2341X_OSD_GET_STATE, 0);
+			data[0] |= (read_reg(0x2a00) >> 7) & 0x40;
 			IVTV_INFO("Overlay:      %s, Alpha: %s, Pixel Format: %s\n",
 				data[0] & 1 ? "On" : "Off",
 				alpha_mode[(data[0] >> 1) & 0x3],
-				pixel_format[(data[0] >> 3) & 0x7]);
+				pixel_format[(data[0] >> 3) & 0xf]);
 		}
 		IVTV_INFO("Tuner:  %s\n",
 			test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) ? "Radio" : "TV");