"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ffmpeg.h" between
motion-release-4.2.2.tar.gz and motion-Release-4.3.0.tar.gz

About: Motion monitors the video signal from one or more cameras and is able to detect motion.

ffmpeg.h  (motion-release-4.2.2):ffmpeg.h  (motion-Release-4.3.0)
skipping to change at line 18 skipping to change at line 18
#include "config.h" #include "config.h"
struct image_data; /* forward declare for functions */ struct image_data; /* forward declare for functions */
struct rtsp_context; struct rtsp_context;
enum TIMELAPSE_TYPE { enum TIMELAPSE_TYPE {
TIMELAPSE_NONE, /* No timelapse, regular processing */ TIMELAPSE_NONE, /* No timelapse, regular processing */
TIMELAPSE_APPEND, /* Use append version of timelapse */ TIMELAPSE_APPEND, /* Use append version of timelapse */
TIMELAPSE_NEW /* Use create new file version of timelapse */ TIMELAPSE_NEW /* Use create new file version of timelapse */
}; };
/* Enumeration of the user requested codecs that need special handling */
enum USER_CODEC {
USER_CODEC_V4L2M2M, /* Requested codec for movie is h264_v4l2m2m */
USER_CODEC_H264OMX, /* Requested h264_omx */
USER_CODEC_MPEG4OMX, /* Requested mpeg4_omx */
USER_CODEC_DEFAULT /* All other default codecs */
};
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include <errno.h> #include <errno.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavutil/imgutils.h> #include <libavutil/imgutils.h>
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
#include <libavdevice/avdevice.h> #include <libavdevice/avdevice.h>
#if (LIBAVFORMAT_VERSION_MAJOR >= 56) #if (LIBAVFORMAT_VERSION_MAJOR >= 56)
#define MY_PIX_FMT_YUV420P AV_PIX_FMT_YUV420P #define MY_PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
skipping to change at line 64 skipping to change at line 72
int quality; int quality;
const char *codec_name; const char *codec_name;
int64_t last_pts; int64_t last_pts;
int64_t base_pts; int64_t base_pts;
int test_mode; int test_mode;
int gop_cnt; int gop_cnt;
struct timeval start_time; struct timeval start_time;
int high_resolution; int high_resolution;
int motion_images; int motion_images;
int passthrough; int passthrough;
enum USER_CODEC preferred_codec;
char *nal_info;
int nal_info_len;
}; };
#else #else
struct ffmpeg { struct ffmpeg {
struct rtsp_context *rtsp_data; struct rtsp_context *rtsp_data;
int width; int width;
int height; int height;
enum TIMELAPSE_TYPE tlapse; enum TIMELAPSE_TYPE tlapse;
int fps; int fps;
int bps; int bps;
char *filename; char *filename;
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)