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

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-08-24 12:01:11 -04:00
parent de63aa8e8d 2a4f751a4f
commit 76473027c2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_ffmpeg_input.cpp
View File

@ -71,7 +71,9 @@ int FFmpeg_Input::Open( const char *filepath ) {
if ((error = avcodec_open2( streams[i].context, streams[i].codec, NULL)) < 0) { if ((error = avcodec_open2( streams[i].context, streams[i].codec, NULL)) < 0) {
Error( "Could not open input codec (error '%s')\n", Error( "Could not open input codec (error '%s')\n",
av_make_error_string(error).c_str() ); av_make_error_string(error).c_str() );
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
avcodec_free_context( &streams[i].context ); avcodec_free_context( &streams[i].context );
#endif
avformat_close_input(&input_format_context); avformat_close_input(&input_format_context);
return error; return error;
} }