vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Apr 6 08:54:27 2012 +0300| [308e4bdcaf474472ff9086b1566b238e6095583f] | committer: Rémi Denis-Courmont
v4l2: disable compressed formats where not available (Linux < 3.1) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=308e4bdcaf474472ff9086b1566b238e6095583f --- modules/access/v4l2/demux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c index da6d37a..7aad23e 100644 --- a/modules/access/v4l2/demux.c +++ b/modules/access/v4l2/demux.c @@ -180,6 +180,7 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] = /* Compressed data types */ { 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 }, /* FIXME: fill p_extra for avc1... */ // { 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[] = { 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_L, VLC_CODEC_VC1, 0, 0, 0 }, +#endif //V4L2_PIX_FMT_MPEG -> use access /* Reserved formats */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
