Skip to content

V
vlc-2-2
Commit 308e4bdc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

v4l2: disable compressed formats where not available (Linux < 3.1)

parent bd23dee8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/access/v4l2/demux.c
View file @ 308e4bdc
...@@ -180,6 +180,7 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] = ...@@ -180,6 +180,7 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] =
/* Compressed data types */ /* Compressed data types */
{ V4L2_PIX_FMT_JPEG, VLC_CODEC_MJPG, 0, 0, 0 }, { V4L2_PIX_FMT_JPEG, VLC_CODEC_MJPG, 0, 0, 0 },
#ifdef V4L2_PIX_FMT_H264
{ V4L2_PIX_FMT_H264, VLC_CODEC_H264, 0, 0, 0 }, { V4L2_PIX_FMT_H264, VLC_CODEC_H264, 0, 0, 0 },
/* FIXME: fill p_extra for avc1... */ /* FIXME: fill p_extra for avc1... */
// { V4L2_PIX_FMT_H264_NO_SC, VLC_FOURCC('a','v','c','1'), 0, 0, 0 } // { V4L2_PIX_FMT_H264_NO_SC, VLC_FOURCC('a','v','c','1'), 0, 0, 0 }
...@@ -190,6 +191,7 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] = ...@@ -190,6 +191,7 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] =
{ V4L2_PIX_FMT_MPEG1, VLC_CODEC_MPGV, 0, 0, 0 }, { V4L2_PIX_FMT_MPEG1, VLC_CODEC_MPGV, 0, 0, 0 },
{ V4L2_PIX_FMT_VC1_ANNEX_G, VLC_CODEC_VC1, 0, 0, 0 }, { V4L2_PIX_FMT_VC1_ANNEX_G, VLC_CODEC_VC1, 0, 0, 0 },
{ V4L2_PIX_FMT_VC1_ANNEX_L, VLC_CODEC_VC1, 0, 0, 0 }, { V4L2_PIX_FMT_VC1_ANNEX_L, VLC_CODEC_VC1, 0, 0, 0 },
#endif
//V4L2_PIX_FMT_MPEG -> use access //V4L2_PIX_FMT_MPEG -> use access
/* Reserved formats */ /* Reserved formats */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment