Merge branch 'ni_quadra' of github.com:ZoneMinder/zoneminder into ni_quadra

Author: connortechnology

src/zm_ffmpeg_camera.cpp

@@ -326,6 +326,7 @@ int FfmpegCamera::OpenFfmpeg() {
     if (ret < 0) {
       Warning("Could not parse ffmpeg input options '%s'", mOptions.c_str());
     }
+    av_dict_set(&opts, "xcoder-params", nullptr, AV_DICT_MATCH_CASE);
   }
 
   // Set transport method as specified by method field, rtpUni is default

src/zm_remote_camera_rtsp.cpp

@@ -86,8 +86,7 @@ RemoteCameraRtsp::RemoteCameraRtsp(
 RemoteCameraRtsp::~RemoteCameraRtsp() {
 
   if ( mVideoCodecContext ) {
-    avcodec_close(mVideoCodecContext);
-    mVideoCodecContext = nullptr; // Freed by avformat_free_context in the destructor of RtspThread class
+    avcodec_free_context(&mVideoCodecContext);
   }
   // Is allocated in RTSPThread and is free there as well
   mFormatContext = nullptr;