diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-26 20:06:44 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-26 20:06:44 +0100 |
| commit | 4e264feffade0d266f5c624ea2972d6e31f9ba22 (patch) | |
| tree | 80137268b1dff0d225e0d5f2bc091d49e135c4d5 /src/input/input_v4l2.c | |
| parent | b79a6345c075d6d07a45794888136c792c687568 (diff) | |
| parent | 7991c3891d62ccbcfe8fc9670b03907444e7910d (diff) | |
| download | xine-lib-4e264feffade0d266f5c624ea2972d6e31f9ba22.tar.gz xine-lib-4e264feffade0d266f5c624ea2972d6e31f9ba22.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/input/input_v4l2.c')
| -rw-r--r-- | src/input/input_v4l2.c | 2 |
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:/"; |