mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-09-08 11:26:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

bump libavutil version check as per @SteveGilvarry

Browse Source
This commit is contained in:
Isaac Connor committed 2016-08-09 13:14:10 -04:00
1 parent 0b92b950e2
commit 3f713df826
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/zm_ffmpeg.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
return pf;
}
/* The following is copied directly from newer ffmpeg. */
#if LIBAVUTIL_VERSION_CHECK(52, 6, 0, 6, 0)
#if LIBAVUTIL_VERSION_CHECK(52, 7, 0, 17, 100)
#else
static int parse_key_value_pair(AVDictionary **pm, const char **buf,
const char *key_val_sep, const char *pairs_sep,
src/zm_ffmpeg.h
+1 -1
View File
@@ -276,7 +276,7 @@ protected:
#define av_err2str(errnum) av_make_error_string(errnum).c_str()
/* The following is copied directly from newer ffmpeg */
#if LIBAVUTIL_VERSION_CHECK(52, 6, 0, 0, 0)
#if LIBAVUTIL_VERSION_CHECK(52, 7, 0, 17, 100)
#else
int av_dict_parse_string(AVDictionary **pm, const char *str,
const char *key_val_sep, const char *pairs_sep,