Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

src/zm_videostore.cpp

@@ -379,8 +379,12 @@ bool VideoStore::setup_resampler() {
 #ifdef HAVE_LIBAVRESAMPLE
   static char error_buffer[256];
 
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
   // Newer ffmpeg wants to keep everything separate... so have to lookup our own decoder, can't reuse the one from the camera.
   AVCodec *audio_input_codec = avcodec_find_decoder(audio_input_stream->codecpar->codec_id);
+#else
+  AVCodec *audio_input_codec = avcodec_find_decoder(audio_input_context->codec_id);
+#endif
   ret = avcodec_open2( audio_input_context, audio_input_codec, NULL );
   if ( ret < 0 ) {
     Error("Can't open input codec!");

utils/packpack/startpackpack.sh

@@ -151,6 +151,16 @@ setdebpkgver () {
 
 }
 
+# This adds an entry to the debian changelog
+setdebchangelog () {
+DATE=`date -R`
+cat <<EOF > debian/changelog
+zoneminder ($VERSION-${DIST}-1) unstable; urgency=low
+  * 
+ -- Isaac Connor <iconnor@connortechnology.com>  $DATE
+EOF
+}
+
 ################
 # MAIN PROGRAM #
 ################
@@ -220,7 +230,9 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true"  ]; then
         else 
             ln -sfT distros/ubuntu1604 debian
         fi
-
+        
+        setdebchangelog
+        
         echo "Starting packpack..."
         packpack/packpack
 
@@ -239,6 +251,8 @@ elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ] && [ "${ARCH}" == "x86
 
     ln -sfT distros/ubuntu1204 debian
 
+    setdebchangelog
+    
     echo "Starting packpack..."
     packpack/packpack