Prevent the use of SendReceiveStringList() on a socket with callbacks. Fixes #11777
(cherry picked from commit 836eb11d96abfaa5986e7382103db69769b0ae47)
Make sure callbacks are disabled when the slave backend ANNounces.

Refs #11867
(cherry picked from commit 84fa3fe02d6731d06b4d64573253710405767923)
Disable MHEG/ITV when generating previews or flagging commercials
(cherry picked from commit bc62d105d6cd594e18c8d0674902916d3b00d37b)
Use the ChannelIcon storage group in the services API Guide/GetChannelIcon()
(cherry picked from commit d21c685f62c58e596ce1ece86e85040285eb0ccd)
Add ChannelIcons to the list of "special" storage groups.

Signed-off-by: Raymond Wagner <rwagner@mythtv.org>
(cherry picked from commit d2316b47974f27dc333dd2924e8beb0aca92a73e)

Conflicts:

	mythtv/libs/libmythbase/storagegroup.cpp
decode URL before attempting to open them.

Thanks to Chris Pinkham for finding the root cause.

Fixes #11909

(cherry picked from commit cba3bc592f837b4680c2ec8075502b9323bdd3fe)
Revert "Add ChannelIcons to the list of "special" storage groups."

This reverts commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6.

See 3d95e17
Fix services GetChannelIcon() when height or width are specified
(cherry picked from commit 15b82903a101eb2111889fb2c9600181f122dcce)
Fix some cc608 field number handling.  Refs #11899.

More accurately decodes CEA-608 captions encoded in SCTE-20 user data.
  * Field number 3 is merged with field number 1 instead of 2.
  * Data in field number 3 is not rejected.
  * Field numbers 1 and 2 are then swapped if top_field_first is false.
These changes are based on the SCTE 20 handling code from ccextractor.
(cherry picked from commit e20a6310b1a2716ce601950a7278726c6d41b538)
Use Live TV order for the card list.

In many cases, the list of available cards was being returned in card
ID order, when it would be more appropriate (and correct) to use the
Live TV order.
Allow Live TV to be entered from the top-level Program Guide.

This allows the user to start Live TV on a specific channel from the
Program Guide grid.  Otherwise, the user needs to wait for Live TV to
start and tune the initial channel, then find the channel actually
wanted, and wait for it to be tuned.  This also provides a workaround
when the default initial channel is untunable for some reason.

Currently, if the desired channel is not tunable (e.g., all capable
recorders are already busy), it will fail.

Refs #11913.
Revert "Allow Live TV to be entered from the top-level Program Guide."

This reverts commit 7555b69babe1e600a33978ecf0d60756bf391e40.
Revert "Use Live TV order for the card list."

This reverts commit 7ed0e9dc03ccd542567dee8b27724438166aa3b7.
Use Live TV order for the card list.

In many cases, the list of available cards was being returned in card
ID order, when it would be more appropriate (and correct) to use the
Live TV order.

This fixes a regression introduced in
dc6a18af542c9de80f06cc22485d6ac8b932dfeb.

(cherry picked from commit 2bb4d08dd087646f7c88557d6d822f98e4e1933a)
Bump ABI version after 9ecf7a69ffc00d3f03dbb4c7a611a02d1f19f702.
Fixes #11905 - HttpRequest parsing fails on parameters containing encoded & character
Any V4L card may need to preset the tuner.

Refs [a3cdcf573]

(cherry picked from commit c649ee2c2d01ad2dbb95646ec75b78294a4f3709)
Fix marking of 1080/720 videos.
(cherry picked from commit 7ed0e5fb3dd90eca4eb9cdf8371be11e80a41fa6)
MythZoneMinder: add some initial support for ZoneMinder >= 1.26.0

Thanks to Warpme for testing the patch.

Note: this bumps the MythZoneMinder protocol version so both the FE plugin
and mythzmserver need to be updated.

(cherry picked from commit 39401bfb8de62852679564bb518e2c8a57b4c01c)
MythZoneMinder: Add six and eight camera layouts to the live view screen

The live view can now show 1, 2, 4, 6, or 8 cameras at the same time.

Note to themers: You will need to add the new layouts to the zmliveplayer
window definition if you have themed it.

(cherry picked from commit 02c66c8d61e4adaade50a41922ccf0f2c6820b11)