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

Merge branch 'feature-h264-videostorage' into Video-Highlander-Branch

This commit is contained in:
SteveGilvarry 2014-12-02 22:20:51 +11:00
parent bf33eab17c 4a492ce088
commit add8f76553
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_ffmpeg_camera.cpp
View File

@ -308,7 +308,6 @@ int FfmpegCamera::OpenFfmpeg() {
mVideoStreamId = i; mVideoStreamId = i;
break; break;
} }
}
if(mAudioStreamId == -1) //FIXME best way to copy all other streams? if(mAudioStreamId == -1) //FIXME best way to copy all other streams?
{ {
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1) #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
@ -442,7 +441,6 @@ int FfmpegCamera::FfmpegInterruptCallback(void *ctx)
Error ( "Open video took more than %d seconds.", config.ffmpeg_open_timeout ); Error ( "Open video took more than %d seconds.", config.ffmpeg_open_timeout );
return 1; return 1;
} }
av_free_packet( &packet );
} }
return 0; return 0;