summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-15 14:01:31 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-15 14:01:31 -0200
commitd64d374f003ecd32b679f723dc53caabbebcee89 (patch)
tree532965aaed3e0ef00c74fa34e049ab5c28cfd863 /linux/include/media
parent11b97f9139c281b7e9d67cec412df077d1cad70b (diff)
parent187ec9f34c39cb5623ffbfa7c79d72baf59d1e97 (diff)
downloadmediapointer-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/include/media')
-rw-r--r--linux/include/media/v4l2-dev.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h
index 5a8faf648..64918029f 100644
--- a/linux/include/media/v4l2-dev.h
+++ b/linux/include/media/v4l2-dev.h
@@ -287,10 +287,6 @@ struct video_device
int (*vidioc_s_crop) (struct file *file, void *fh,
struct v4l2_crop *a);
/* Compression ioctls */
- int (*vidioc_g_mpegcomp) (struct file *file, void *fh,
- struct v4l2_mpeg_compression *a);
- int (*vidioc_s_mpegcomp) (struct file *file, void *fh,
- struct v4l2_mpeg_compression *a);
int (*vidioc_g_jpegcomp) (struct file *file, void *fh,
struct v4l2_jpegcompression *a);
int (*vidioc_s_jpegcomp) (struct file *file, void *fh,