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

Handle value of auto for encoder

This commit is contained in:
Isaac Connor 2021-02-18 13:30:38 -05:00
parent 0d59584250
commit 04c13c6ff3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_videostore.cpp
View File

@ -164,7 +164,7 @@ bool VideoStore::open() {
std::string wanted_encoder = monitor->Encoder(); std::string wanted_encoder = monitor->Encoder();
for ( unsigned int i = 0; i < sizeof(codec_data) / sizeof(*codec_data); i++ ) { for ( unsigned int i = 0; i < sizeof(codec_data) / sizeof(*codec_data); i++ ) {
if ( wanted_encoder != "" ) { if ( wanted_encoder != "" and wanted_encoder != "auto" ) {
if ( wanted_encoder != codec_data[i].codec_name ) { if ( wanted_encoder != codec_data[i].codec_name ) {
Debug(1, "Not the right codec name %s != %s", codec_data[i].codec_name, wanted_encoder.c_str()); Debug(1, "Not the right codec name %s != %s", codec_data[i].codec_name, wanted_encoder.c_str());
continue; continue;
@ -262,7 +262,7 @@ bool VideoStore::open() {
// We allocate and copy in newer ffmpeg, so need to free it // We allocate and copy in newer ffmpeg, so need to free it
avcodec_free_context(&video_out_ctx); avcodec_free_context(&video_out_ctx);
#endif #endif
video_out_ctx = nullptr; //video_out_ctx = nullptr;
return false; return false;
} // end if can't open codec } // end if can't open codec