diff options
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-video-v4l.c | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e2839d4bd..9f734aa50 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-12-28 16:24 mcisely + + * v4l_experimental/pvrusb2/pvrusb2-video-v4l.c: + (pvr2_decoder_v4l_set_audio): + + - Adjust pvrusb2 driver to account for changed + VIDIOC_INT_AUDIO_CLOCK_FREQ API + + Signed-off-by: Mike Isely <isely@pobox.com> + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2005-12-28 16:17 mcisely * v4l_experimental/pvrusb2/pvrusb2-hdw.h: diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c index c1702d990..037ba5a71 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c +++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-video-v4l.c,v 1.4 2005/12/02 13:59:00 mcisely Exp $ + * $Id: pvrusb2-video-v4l.c,v 1.5 2005/12/28 16:28:02 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -178,17 +178,17 @@ static int pvr2_decoder_v4l_set_audio(struct pvr2_decoder *dcp) { int ret; struct pvr2_hdw *hdw = dcp->hdw; - enum v4l2_audio_clock_freq val; + u32 val; pvr2_decoder_trace("pvr2_decoder_set_audio %d", hdw->controls[PVR2_CID_SRATE].value); switch (hdw->controls[PVR2_CID_SRATE].value) { default: case PVR2_CVAL_SRATE_48: - val = V4L2_AUDCLK_48_KHZ; + val = 48000; break; case PVR2_CVAL_SRATE_44_1: - val = V4L2_AUDCLK_441_KHZ; + val = 44100; break; } ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_INT_AUDIO_CLOCK_FREQ,&val); |