ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements to zm_ffmpeg.h

This commit is contained in:
Kfir Itzhak 2013-10-10 07:16:11 +03:00
parent fcf969f575
commit 421d67e379
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/zm_ffmpeg.h
View File

@ -20,48 +20,56 @@
#ifndef ZM_FFMPEG_H #ifndef ZM_FFMPEG_H
#define ZM_FFMPEG_H #define ZM_FFMPEG_H
#include <stdint.h> #include <stdint.h>
#if HAVE_LIBAVCODEC
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
// AVUTIL
#if HAVE_LIBAVUTIL_AVUTIL_H #if HAVE_LIBAVUTIL_AVUTIL_H
#include <libavutil/avutil.h> #include <libavutil/avutil.h>
#include <libavutil/base64.h> #include <libavutil/base64.h>
#include <libavutil/mathematics.h>
#elif HAVE_FFMPEG_AVUTIL_H #elif HAVE_FFMPEG_AVUTIL_H
#include <ffmpeg/avutil.h> #include <ffmpeg/avutil.h>
#include <ffmpeg/base64.h> #include <ffmpeg/base64.h>
/*#else #include <ffmpeg/mathematics.h>
#error "No location for avutils.h found"*/
#endif #endif
// AVCODEC
#if HAVE_LIBAVCODEC_AVCODEC_H #if HAVE_LIBAVCODEC_AVCODEC_H
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#elif HAVE_FFMPEG_AVCODEC_H #elif HAVE_FFMPEG_AVCODEC_H
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
/*#else
#error "No location for avcodec.h found"*/
#endif #endif
// AVFORMAT
#if HAVE_LIBAVFORMAT_AVFORMAT_H #if HAVE_LIBAVFORMAT_AVFORMAT_H
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#elif HAVE_FFMPEG_AVFORMAT_H #elif HAVE_FFMPEG_AVFORMAT_H
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
/*#else
#error "No location for avformat.h found"*/
#endif #endif
#if HAVE_LIBSWSCALE
// AVDEVICE
#if HAVE_LIBAVDEVICE_AVDEVICE_H
#include <libavdevice/avdevice.h>
#elif HAVE_FFMPEG_AVDEVICE_H
#include <ffmpeg/avdevice.h>
#endif
// SWSCALE
#if HAVE_LIBSWSCALE_SWSCALE_H #if HAVE_LIBSWSCALE_SWSCALE_H
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#include <libavutil/mathematics.h> // this is a fix for error: 'av_rescale_q' was not declared in this scope
#elif HAVE_FFMPEG_SWSCALE_H #elif HAVE_FFMPEG_SWSCALE_H
#include <ffmpeg/swscale.h> #include <ffmpeg/swscale.h>
/*#else
#error "No location for swscale.h found"*/
#endif #endif
#endif // HAVE_LIBSWSCALE
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#if ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
#if defined(AVIO_WRONLY) #if defined(AVIO_WRONLY)
#define AVIO_FLAG_WRITE AVIO_WRONLY #define AVIO_FLAG_WRITE AVIO_WRONLY
@ -87,7 +95,7 @@ extern "C" {
#define SWS_CPU_CAPS_SSE2 0x02000000 #define SWS_CPU_CAPS_SSE2 0x02000000
#endif #endif
#endif // HAVE_LIBAVCODEC #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
#endif // ZM_FFMPEG_H #endif // ZM_FFMPEG_H