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

Merge pull request #1148 from SteveGilvarry/FixMergeRegression 

Add FFMPEGInit back to feature-h264-videostorage
This commit is contained in:
Steve Gilvarry 2015-11-05 19:39:20 +11:00
parent db6aab2071 6002f251c0
commit 1e5c82937c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_ffmpeg.h
View File

@ -195,6 +195,9 @@ extern "C" {
#endif #endif
#endif #endif
/* A single function to initialize ffmpeg, to avoid multiple initializations */
void FFMPEGInit();
#if HAVE_LIBAVUTIL #if HAVE_LIBAVUTIL
enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder); enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder);
#endif // HAVE_LIBAVUTIL #endif // HAVE_LIBAVUTIL