diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 14:01:31 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 14:01:31 -0200 |
| commit | d64d374f003ecd32b679f723dc53caabbebcee89 (patch) | |
| tree | 532965aaed3e0ef00c74fa34e049ab5c28cfd863 /linux/drivers/media/video/v4l2-common.c | |
| parent | 11b97f9139c281b7e9d67cec412df077d1cad70b (diff) | |
| parent | 187ec9f34c39cb5623ffbfa7c79d72baf59d1e97 (diff) | |
| download | mediapointer-dvb-s2-d64d374f003ecd32b679f723dc53caabbebcee89.tar.gz mediapointer-dvb-s2-d64d374f003ecd32b679f723dc53caabbebcee89.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/mpegcomp
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/v4l2-common.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index d595452a3..49450c919 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -339,10 +339,6 @@ static const char *v4l2_ioctls[] = { [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", [_IOC_NR(VIDIOC_G_FMT)] = "VIDIOC_G_FMT", [_IOC_NR(VIDIOC_S_FMT)] = "VIDIOC_S_FMT", -#if 1 /* experimental*/ - [_IOC_NR(VIDIOC_G_MPEGCOMP)] = "VIDIOC_G_MPEGCOMP", - [_IOC_NR(VIDIOC_S_MPEGCOMP)] = "VIDIOC_S_MPEGCOMP", -#endif [_IOC_NR(VIDIOC_REQBUFS)] = "VIDIOC_REQBUFS", [_IOC_NR(VIDIOC_QUERYBUF)] = "VIDIOC_QUERYBUF", [_IOC_NR(VIDIOC_G_FBUF)] = "VIDIOC_G_FBUF", @@ -756,22 +752,6 @@ void v4l_printk_ioctl_arg(const char *s, unsigned int cmd, const void *arg) p->rangehigh,p->txsubchans); break; } - case VIDIOC_G_MPEGCOMP: - case VIDIOC_S_MPEGCOMP: - { - const struct v4l2_mpeg_compression *p=arg; - /*FIXME: Several fields not shown */ - printk ("%s: ts_pid_pmt=%d, ts_pid_audio=%d, ts_pid_video=%d, " - "ts_pid_pcr=%d, ps_size=%d, au_sample_rate=%d, " - "au_pesid=%c, vi_frame_rate=%d, vi_frames_per_gop=%d, " - "vi_bframes_count=%d, vi_pesid=%c\n", s, - p->ts_pid_pmt,p->ts_pid_audio, p->ts_pid_video, - p->ts_pid_pcr, p->ps_size, p->au_sample_rate, - p->au_pesid, p->vi_frame_rate, - p->vi_frames_per_gop, p->vi_bframes_count, - p->vi_pesid); - break; - } case VIDIOC_ENUMOUTPUT: { const struct v4l2_output *p=arg; |