X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg%200.7%2Finclude%2Flibavdevice%2Favdevice.h;h=e49e5b71f7ff161270e738e5183f84a2d15669a3;hb=f125bd720bf68257b9a0adbfc4ec1caef0596a2d;hp=d31c99e654217271eeab9facfdc777117a1b63f2;hpb=4f7058172b7b297e10aad63001a9f4521846b06e;p=casparcg diff --git a/ffmpeg 0.7/include/libavdevice/avdevice.h b/ffmpeg 0.7/include/libavdevice/avdevice.h index d31c99e65..e49e5b71f 100644 --- a/ffmpeg 0.7/include/libavdevice/avdevice.h +++ b/ffmpeg 0.7/include/libavdevice/avdevice.h @@ -20,10 +20,11 @@ #define AVDEVICE_AVDEVICE_H #include "libavutil/avutil.h" +#include "libavformat/avformat.h" #define LIBAVDEVICE_VERSION_MAJOR 53 -#define LIBAVDEVICE_VERSION_MINOR 0 -#define LIBAVDEVICE_VERSION_MICRO 0 +#define LIBAVDEVICE_VERSION_MINOR 1 +#define LIBAVDEVICE_VERSION_MICRO 1 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ @@ -33,6 +34,10 @@ LIBAVDEVICE_VERSION_MICRO) #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. */