diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 03:47:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 04:53:21 +0400 |
| commit | 027264cb82134c83413810810b24340f6290e11a (patch) | |
| tree | 11009209889b89443c2194dda88ef1ed7c4976ec /libavdevice/v4l.c | |
| parent | 701012d676042608cd6ec3317c1936a246f436d7 (diff) | |
| parent | ca7d8256e32e4dbafadc54a65b441945ac759ca9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
ARM: add ARMv6 optimised av_clip_uintp2
ARM: remove volatile from asm statements in libavutil/intmath
ARM: fix av_clipl_int32_arm()
v4l: include avdevice.h
ffserver: move close_connection() call to avoid a temporary string and copy.
lavf: initialize demuxer private options.
AVOptions: set string default values.
lavdevice: mark v4l for removal on next major bump.
swscale: fix compile on ppc.
swscale: fix compile on x86-32.
build: Remove generated .version file on distclean.
configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
ffplay: Remove disabled code.
Mark parameterless function declarations as 'void'.
swscale: use av_clip_uint8() in yuv2yuv1_c().
swscale: remove VOF/VOFW.
swscale: split chroma buffers into separate U/V planes.
swscale: replace formatConvBuffer[VOF] by allocated array.
rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l.c')
| -rw-r--r-- | libavdevice/v4l.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index a49ca8005f..337b489e92 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avdevice.h" + +#if FF_API_V4L + #undef __STRICT_ANSI__ //workaround due to broken kernel headers #include "config.h" #include "libavutil/rational.h" @@ -83,6 +87,8 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) int j; int vformat_num = FF_ARRAY_ELEMS(video_formats); + av_log(s1, AV_LOG_WARNING, "V4L input device is deprecated and will be removed in the next release."); + if (ap->time_base.den <= 0) { av_log(s1, AV_LOG_ERROR, "Wrong time base (%d)\n", ap->time_base.den); return -1; @@ -374,3 +380,4 @@ AVInputFormat ff_v4l_demuxer = { .flags = AVFMT_NOFILE, .priv_class = &v4l_class, }; +#endif /* FF_API_V4L */ |