Browse Source

lavdevice: mark v4l for removal on next major bump.

tags/n0.8
Anton Khirnov 14 years ago
parent
commit
aaea149035
3 changed files with 11 additions and 0 deletions
  1. +2
    -0
      libavdevice/alldevices.c
  2. +4
    -0
      libavdevice/avdevice.h
  3. +5
    -0
      libavdevice/v4l.c

+ 2
- 0
libavdevice/alldevices.c View File

@@ -47,7 +47,9 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV (OSS, oss); REGISTER_INOUTDEV (OSS, oss);
REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INOUTDEV (SNDIO, sndio);
REGISTER_INDEV (V4L2, v4l2); REGISTER_INDEV (V4L2, v4l2);
#if FF_API_V4L
REGISTER_INDEV (V4L, v4l); REGISTER_INDEV (V4L, v4l);
#endif
REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (VFWCAP, vfwcap);
REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device);




+ 4
- 0
libavdevice/avdevice.h View File

@@ -33,6 +33,10 @@
LIBAVDEVICE_VERSION_MICRO) LIBAVDEVICE_VERSION_MICRO)
#define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT


#ifndef FF_API_V4L
#define FF_API_V4L (LIBAVDEVICE_VERSION_MAJOR < 54)
#endif

/** /**
* Return the LIBAVDEVICE_VERSION_INT constant. * Return the LIBAVDEVICE_VERSION_INT constant.
*/ */


+ 5
- 0
libavdevice/v4l.c View File

@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */


#if FF_API_V4L

#undef __STRICT_ANSI__ //workaround due to broken kernel headers #undef __STRICT_ANSI__ //workaround due to broken kernel headers
#include "config.h" #include "config.h"
#include "libavutil/rational.h" #include "libavutil/rational.h"
@@ -83,6 +85,8 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
int j; int j;
int vformat_num = FF_ARRAY_ELEMS(video_formats); 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) { if (ap->time_base.den <= 0) {
av_log(s1, AV_LOG_ERROR, "Wrong time base (%d)\n", ap->time_base.den); av_log(s1, AV_LOG_ERROR, "Wrong time base (%d)\n", ap->time_base.den);
return -1; return -1;
@@ -368,3 +372,4 @@ AVInputFormat ff_v4l_demuxer = {
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
.priv_class = &v4l_class, .priv_class = &v4l_class,
}; };
#endif /* FF_API_V4L */

Loading…
Cancel
Save