summaryrefslogtreecommitdiff
path: root/src/input/input_v4l2.c
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-18 11:40:01 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-18 11:40:01 +0300
commit29f7af688b53a81ba1a96c31757b86fde699e679 (patch)
tree01bf70ec660e29c0575dd72855cec0001812f896 /src/input/input_v4l2.c
parentb79a6345c075d6d07a45794888136c792c687568 (diff)
parent5c160b93ade6a07e3bcc084f4552dcd1eb70b5b4 (diff)
downloadxine-lib-29f7af688b53a81ba1a96c31757b86fde699e679.tar.gz
xine-lib-29f7af688b53a81ba1a96c31757b86fde699e679.tar.bz2
Merge from 1.1
Diffstat (limited to 'src/input/input_v4l2.c')
-rw-r--r--src/input/input_v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c
index b2938d609..7f7da68ba 100644
--- a/src/input/input_v4l2.c
+++ b/src/input/input_v4l2.c
@@ -350,7 +350,7 @@ static uint32_t v4l2_input_get_capabilities(input_plugin_t* this_gen) {
}
static const char* v4l2_input_get_mrl(input_plugin_t* this_gen) {
- v4l2_input_plugin_t* this = (v4l2_input_plugin_t*)this_gen;
+ /*v4l2_input_plugin_t* this = (v4l2_input_plugin_t*)this_gen;*/
/* HACK HACK HACK HACK */
/* So far, the only way to get the yuv_frames demuxer to work with this */
return "v4l:/";