diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-11 21:48:16 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-11 21:48:16 -0600 |
| commit | 6b40ffcb5f39a5800e53009ea86644ab4379f6e9 (patch) | |
| tree | 8af62f5684edaddcad012963294660dcd5ddd0cd /linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | |
| parent | 489136d3001a4bc8c145bbf2fcfa94b030d3ce05 (diff) | |
| parent | ce0d3ab528dee0769d272cebf239505dab2b25d8 (diff) | |
| download | mediapointer-dvb-s2-6b40ffcb5f39a5800e53009ea86644ab4379f6e9.tar.gz mediapointer-dvb-s2-6b40ffcb5f39a5800e53009ea86644ab4379f6e9.tar.bz2 | |
Merge in ~mkrufky/pvrusb2-cleanup
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c index 6d797cb55..97931d3c4 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c @@ -308,14 +308,14 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw) the ivtv driver). But, if I leave them in, then mplayer goes nuts with xrun errors. So for now we don't do this. It sure would be nice to know what these are for. */ -#ifdef notdef +#if 0 ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 1, 5); ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 2, 3, 1); ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 1, 8); #endif /* Strange compared to ivtv data. */ -#ifdef notdef +#if 0 ret |= pvr2_write_encoder_vcmd(hdw, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0x0120, 0x0120); ret |= pvr2_write_encoder_vcmd(hdw, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, |