Merge branch 'release-1.34'

db/zm_create.sql.in

@@ -484,7 +484,7 @@ CREATE TABLE `Monitors` (
   `Hue` mediumint(7) NOT NULL default '-1',
   `Colour` mediumint(7) NOT NULL default '-1',
   `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64) default '%N - %y/%m/%d %H:%M:%S',
+  `LabelFormat` varchar(64),
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',

db/zm_update-1.34.20.sql

@@ -0,0 +1,2 @@
+/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);

src/zm_ffmpeg.h

@@ -40,6 +40,7 @@ extern "C" {
 #include <libavutil/mathematics.h>
 #include <libavutil/avstring.h>
 #include "libavutil/audio_fifo.h"
+#include "libavutil/imgutils.h"
 
 /* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg
  * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)

web/skins/classic/views/monitor.php

@@ -816,7 +816,7 @@ switch ( $tab ) {
             <td><?php echo htmlSelect('newMonitor[Format]', $v4l2DeviceFormats, $monitor->Format()); ?></td>
           </tr>
          <tr>
-<td><?php echo translate('CapturePalette') ?></td>
+            <td><?php echo translate('CapturePalette') ?></td>
             <td><?php echo htmlSelect('newMonitor[Palette]', $v4l2LocalPalettes, $monitor->Palette()); ?></td>
           </tr>
 <?php