commit fac84fab9c8c6e43f51d3090e13e05e68db0ef6e
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sat Jan 4 10:12:23 2014 +0000

    MythMusic: avoid storing a pointer to the current playlist in the music player
    
    Always get the current playlist from MusicData to avoid possibly referencing a
    stale pointer. This can occur while doing a rescan.
    
    Also add NULL checks everywhere just in case.
    
    Refs #11906.
    
    (cherry picked from commit 193dc636e5fa5ac5edd3589094a58e79a6ab779b)

commit bd74a288f3a9fc8911c9507b27f8fe540bde54f4
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Fri Jan 3 18:11:45 2014 +0000

    MythMusic: make sure we null check the returned tagger after 47217ca10a
    
    Also make sure the tagger is deleted after use.
    
    (cherry picked from commit b383c329417a4e4b0b786e51e0d24962728a738b)

commit 70cc07f2d99dd4a2439e249a799c45ec54510991
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Fri Jan 3 18:21:07 2014 +0000

    Bump the ABI version after f359a4ebd3c

commit f359a4ebd3c8a8fff18cdf21813c9d12da8c6c4e
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Fri Jan 3 17:38:39 2014 +0000

    MetaIO: validate the files extension before creating a tagger
    
    This checks the file extension is one we know how to handle before
    creating the tagger. Return NULL if not valid.
    
    This fixes a bug with the music file scanner trying to add files with an
    unknown file extension.
    
    NOTE: bumps the ABI version so compile and install myth core before compiling
    the plugins
    
    (cherry picked from commit 47217ca10adae1e03a37b396d64b605c8f18e6b0)

commit f984e29cc92a9bc88f2d2e4b72a6f822380efa64
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Fri Jan 3 15:56:47 2014 +0000

    MetaIOAVFComment: don't call av_estimate_timings() in getTrackLength()
    
    It's not needed with current ffmpeg and was causing a segfault while scanning
    for music files.
    
    (cherry picked from commit c2128934644892df613590dda7e6017b72c14f94)

commit 7f548de029ed84870538c87193b8b9f650cf0c5a
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Mon Dec 30 11:28:50 2013 +0000

    MythMusic: fix playback of some radio stations
    
    Make sure the maximum size of the QTCPSocket read buffer is set appropriately.
    
    This seems to throttle the sending of readyRead() signals sent to us from
    QTCPSocket better otherwise once we fill our buffer and don't read anything in the
    readyRead() slot the QTCPSocket will eventually not send any more signals causing
    us to run out of data.
    
    Fixes #11872.
    
    (cherry picked from commit 6ddaba216d8f6a7e178d4acfe6930458fb532d05)

commit d96506156c2b200d3c6658e578d7b7fbd4014bad
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sat Dec 21 21:59:46 2013 -0800

    Update binary version after 525ac31dd2215e5ce46fc3b70f7ba883d99b736a.

commit 525ac31dd2215e5ce46fc3b70f7ba883d99b736a
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sat Dec 21 21:14:49 2013 -0800

    Be less aggressive about clearing the bookmark on exit.
    
    Refs #7994.  We shouldn't automatically clear the bookmark at the end
    of the recording if the "Clear bookmark on playback" setting is false.
    (cherry picked from commit 670cb2d55c36f57ca056babccef1d99ae4c4bad0)
    
    Conflicts:
    
    	mythtv/libs/libmythtv/tv_play.cpp

commit 9d4b5e2313ea0b1eb7718264782f529bd88c555d
Author: Karl Dietz <dekarl@mythtv.org>
Date:   Thu Aug 29 23:00:14 2013 +0200

    extend IPTV hack to handle PAT with two entries but only one program
    
    Fixes #11791
    
    (cherry picked from commit 3bd3c71551a938eec2bb50feb48501136704392d)

commit 39171be37ab8d63f0f44e5dbd5a78ca6893ceafa
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Dec 15 21:47:04 2013 +0000

    Icon Downloader: Check that the existing icon is actually a valid image.

commit 65c0eb2c4ab660fcabb5b491dac8e88b6dd10d9e
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Dec 15 20:54:57 2013 +0000

    Metadata Lookup: We want to use the first (best) result, not the last.

commit 5dc9d15856ab6cc7a1f39c191a2bd577a26e4fc8
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Dec 15 13:53:44 2013 +0000

    Fix display for progress dialog in Icon Importer
    (cherry picked from commit 243420f6c1e043530fbe919ec85ae9f41af56323)

commit 8f7c8aa6581e7afacd7e71a3566430e2119ce0b7
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Dec 15 13:34:32 2013 +0000

    Make the check for an existing icon more robust.
    (cherry picked from commit 8b1d8159331e85569d78f5637df49366e5198f40)

commit fa5599d185014db32dd9a34582d090cb5c7121c9
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Dec 13 15:03:50 2013 +0000

    Icon Downloader: Fix 'Re-scan for missing' to check the Channel Icon storage group
    (cherry picked from commit 19f6b618045e9ac9bb7657e90f915e09dc63ba14)

commit 866d1fe713116c7ff665157784b3ca7ae2c9d9b4
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Dec 11 09:31:34 2013 +0000

    Fix segfault in Schedule Editor. Not all recording rules are associated with a program and this pointer therefore needs to be checked first

commit f7852552a089a87d7dd53b5da59958205fbae6fd
Author: Richard Hulme <peper03@mythtv.org>
Date:   Thu Dec 5 00:06:42 2013 +0100

    Fix python bindings to store updates to video markup data.
    (cherry picked from commit 13ae25f5c86bd29a4e854cd5d438436f26d7345e)

commit 26052f483996e28d87e77f5e879eded1e7c727a4
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Dec 4 19:04:05 2013 +0000

    Use category type as a hint in the Schedule Editor Metadata/Artwork searches

commit 15199917e881861add0ab5a21862dd599da45c75
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Dec 4 18:19:49 2013 +0000

    Fix ordering of Artwork in selection dialogs. Best matches should now appear first, not last.
    (cherry picked from commit d95a237d6cf7e79b4b5f807600fd635f37337e2f)

commit ba15be9a30d6ce02c3bc6c8b330dbde8373f008a
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Sep 15 06:25:13 2013 -0700

    Reduce logging level for GetKeyframePositions and GetKeyframeDurations.
    (cherry picked from commit 3c90e595d998e563c7a97a39f9541c157762755e)

commit aea561a518cfa1b638341ab4f42db92fcd379b75
Author: Richard Hulme <peper03@mythtv.org>
Date:   Mon Dec 2 22:29:20 2013 +0100

    Prevent MythWelcome blocking input devices when calling mythshutdown to avoid resetting the idle timer (see [cac1413]) when trying to determine whether the backend is idle, thereby preventing shutdown.
    (cherry picked from commit 1431eecd20c020b9c0ad826993015bc8957e82d6)

commit 339d1ceb1733c0f36182260d0b1a691b0d05cbb3
Author: Richard Hulme <peper03@mythtv.org>
Date:   Mon Dec 2 22:27:25 2013 +0100

    Only jump back in a menu to the nearest previous block with subpictures if a seek operation is already in progress.
    
    This should prevent infinite loops on some discs (e.g. Independence Day) where the menu highlight packets are somehow not processed before the navigation data indicates that buttons must be shown.
    (cherry picked from commit e37383db1f55ad21f200903c18f9750753e05f00)

commit cb744f810c6133aa293ad95d65225890371951f0
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Fri Nov 29 14:35:54 2013 -0500

    Correct issue where TMDB returns less results than claimed.
    (cherry picked from commit 24bcf67da973e4eee738eca68fb5cea36e7c1306)

commit e5acf0cdd90f839aff2820e52daedeef42a509a9
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Fri Nov 22 23:55:54 2013 +0000

    mythzmserver: use the frame size from the shared memory in ZM 1.26.x
    
    Refs #11957.
    
    (cherry picked from commit 3ca16b521dbbca9da868a5a6b0f5e7014b705428)

commit a1e2fa40358803eee57ab4ca2b8d41f745e5eb38
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Nov 3 18:48:13 2013 +0000

    MythZoneMinder: fix typo
    
    (cherry picked from commit fbdd0cdd12e56ae054c18ff311d557dded0fcde2)
    
    Refs #11957

commit c47ba638456e9715d72218bdfc9420bbf0c93aac
Author: John Poet <jpoet@mythtv.org>
Date:   Mon Nov 18 15:10:31 2013 -0700

    HLS: Reopen top level url, if playlist appears to be invalid.
    
    (cherry picked from commit 8a3f4b614a82784bbcee5edbffd6518fbffbebdd)

commit 204d643e35e7eb532cfebe1e82a30417af18a9f9
Author: John Poet <jpoet@mythtv.org>
Date:   Mon Nov 18 10:06:41 2013 -0700

    Improve logging of playlist downloads
    
    (cherry picked from commit 9e80571b52868ac4dc41c1c1dec63705042a67a6)

commit 684e72a1032106ef593c0ab670149dec562c5da0
Author: John Poet <jpoet@mythtv.org>
Date:   Wed Nov 13 09:56:49 2013 -0700

    On some systems, usleep will fail with a value greater than 1000000-1.  Fix
    HLSStreamHandler::run to not exceed 1000000-1.
    
    (cherry picked from commit 3f31d6dbfa3dc68b1b7e436158ad684786ce7ea2)

commit de5f1e5e86e01f92a818d3736b0da6be10cc1d91
Author: John Poet <jpoet@mythtv.org>
Date:   Mon Nov 4 09:07:41 2013 -0700

    Quiet some HLS logging
    
    (cherry picked from commit 58c98b82938237a8ca36c767067616817ad9bdbc)

commit ad7aed0c0a759ca57559cd194e105de8c8a87e68
Author: John Poet <jpoet@mythtv.org>
Date:   Sun Nov 3 14:36:48 2013 -0700

    Add missing 'class' to friend declaration.
    
    (cherry picked from commit 1dd14eaa97f4fe0d5d6f04b1fb66cfb0b933399a)

commit d541c3eba8c285f239b00d560cb4c2aa21a82bd6
Author: John Poet <jpoet@mythtv.org>
Date:   Sun Nov 3 14:18:48 2013 -0700

    The classes defined in httplivestreambuffer.cpp were originally designed for
    
    HLS playback, and are inefficient for recording.  Create a new
    recorder-specific HLS processing class called HLSReader.  Since it is
    specifically designed for recording, HLSReader is more efficient and faster.
    
    (cherry picked from commit a212052e0184ec9a21771c6e49d4a80700aa0fc9)

commit 166c80d2900315fad4d9e84ca18c9a50045daf8d
Author: John Poet <jpoet@mythtv.org>
Date:   Sun Nov 3 14:18:48 2013 -0700

    MythDownloadManager has a memory leak, which can be terminal when used by
    
    the HLS Recorder.  Add a simple MythSingleDownload class which uses
    QNetworkAccessManager directly to avoid the leak, until it can be found and
    fixed.
    
    (cherry picked from commit 950a627790b8a044f10bfd9387f4528618acc6f0)

commit 50e5f450100addf4c01ff49067c4c96a114c884c
Author: John Poet <jpoet@mythtv.org>
Date:   Sun Nov 3 14:18:48 2013 -0700

    Cleanup and simplify the HLS Recorder.
    
    (cherry picked from commit 208ad3145814d51f502c85d5dac007a3eee1e7c4)

commit 552fdc0e1eb538db847f2aedd54a12764b609a76
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Wed Nov 20 18:43:50 2013 +0000

    mythzmserver: fix a possible segfault if no event frames are found
    
    (cherry picked from commit a33c327a1bc7cde68bbb2dfc7648f09b7dc2fdf8)

commit fa62a68ad26f94e9ec44ec9eab5bd461b0aa0a7b
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Nov 17 19:05:32 2013 +0000

    MythZoneMinder: use the itemVisible signal to update the event images
    
    This makes scrolling in the grid a little quicker since it's now only
    updating the images for the visible items.
    
    (cherry picked from commit 21296a9fdcb672a21d884d04deb5983addebaf8d)

commit 5db99c851b87b17dfe28806c4a58ed8ff852ce04
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Tue Nov 19 23:38:22 2013 +0000

    mythburn.py: fix another utcisoformat() missed in fa94c154c7
    
    (cherry picked from commit 90cdee0efa51bdc8ecb20fc1dadfe676a1e1fddc)

commit 860f76059dc0fa70ee1f9ec9b03b7622b98570d2
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Tue Nov 19 23:30:36 2013 +0000

    mythburn.py: only use toprettyxml() in Python >= 2.7.3
    
    There is a bug in older versions of that function which inserts additional
    white space into text nodes causing problems when reading back in the
    prettified xml file.
    
    (cherry picked from commit 41264b6006221900d0a5fa685f67e6b6c0e972ef)

commit a6c1d5336502a97f25b747e0a036fde4d25fd2ee
Author: David Engel <dengel@mythtv.org>
Date:   Mon Nov 18 13:16:59 2013 -0600

    Limit scheduler sleeping when master backend shutdown is enabled.
    
    The longer sleeps added in a2eb9312 could prevent the pending shutdown
    events from being sent.
    
    (cherry picked from commit 7fcc9ccc031eb6418b193b71970ca627c95e1d5c)

commit b0c1c97b9e36dc4cfa91a00c9f65202536f5c10f
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Nov 17 18:21:50 2013 +0000

    MythZoneMinder: fix an invalid frame no. warning when playing back events
    
    Sometimes while single stepping through the event frames the player would try
    to grab frame 0 which will never exist.
    
    (cherry picked from commit ee5de540587a55f8b749da5ece22a15b163619c8)

commit fa94c154c79d0752eb0eb59e579e1985ccf26532
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sun Nov 17 11:22:58 2013 +0000

    mythburn.py: pass the starttime in utc format to mythtranscode
    
    I can't easily test this but hopefully this will fix the problems reported on
    the user mailing list and in #11758.
    
    Refs #11758.
    
    Signed-off-by: Paul Harrison <pharrison@mythtv.org>
    (cherry picked from commit 45e62c8cb69c3abbbf883d926bd5c0e2137d7365)

commit 63d03846eb95cb963ba19fd3aa87fb6a73643daa
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Nov 3 15:08:24 2013 +0000

    MythZoneMinder: finish the support for ZoneMinder >= 0.26.0
    
    All combinations of capture palette and target colour space should now be
    supported. This also moves all the processing to mythzmserver and always
    passes RGB24 to the plugin.
    
    Note: bumps the protocol version so both mythzmserver and the plugin need to
    be updated.
    
    (cherry picked from commit 68c07c49499ca5be40751bf59908bf03b242f281)

commit 531b8e636d876f1f8e7aeb0f3be82cfb7eb655da
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Nov 3 11:51:30 2013 +0000

    mythzmserver: fix the debug output telling us which mmap files we opened
    
    (cherry picked from commit ce27ac589bf510e280fa1ebabe46b250b6452722)

commit 4ca9300fb95fbda7a8d7803f0c1507ebc166ed10
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Nov 15 05:45:05 2013 -0800

    Fix compiler warnings spotted by Jonatan Lindblad.
    
    Cherry-picked from most of c06c191712a7e0721a423528f37420c30d53cab7.

commit cc247f09460ac362f0fd6ffcd7b25c3139d39b7c
Author: Richard Hulme <peper03@mythtv.org>
Date:   Fri Nov 15 10:27:45 2013 +0100

    Make ffmpeg call 'streams_changed' again when a DVD PCM stream is changed from PCM_DVD to PCM_S16BE to ensure the correct codec is loaded.
    
    Fixes #11941
    (cherry picked from commit d8c710d204f5769ea4d0304a9a8618eb417f2837)

commit 77a66f4fd77744727c2a22182d34a69da94290c0
Author: John Poet <jpoet@mythtv.org>
Date:   Thu Oct 31 09:18:25 2013 -0600

    Following [080ef223c] don't segfault if curRecording is NULL.
    
    (cherry picked from commit fabca8bee90ed0765b9f0f902e92bdbed88f5123)

commit f7a44a37cb018b7ba4875057658d549e6a8852bc
Author: John Poet <jpoet@mythtv.org>
Date:   Wed Oct 30 12:10:31 2013 -0600

    Re-enable display of tuning status in LiveTV after [9b22460f5]
    
    (cherry picked from commit fc2ba41a253f115976bcc8794b13297ec41eb150)

commit c169ca077787d1e5ca9a96cbfb0a45bcc1d1ff31
Author: John Poet <jpoet@mythtv.org>
Date:   Wed Oct 30 12:02:26 2013 -0600

    Don't timeout the signalmonitor until all hope is lost.
    
    (cherry picked from commit 080ef223c56682bbe356be293a53f3d38f6ca5c2)

commit 4f9f78f55a0c7cb5b3c6ed1d5ae43e88f5b40e50
Author: John Poet <jpoet@mythtv.org>
Date:   Wed Oct 30 11:39:09 2013 -0600

    H264Parser: Only enter the "state changed" state if we have seen a SPS.
    
    Fixes #11882
    May help or solve #11886
    
    (cherry picked from commit 306f9fc004d52e87defca84f8c33616ef0e00485)

commit 4a2a63d2ba5b8175cea0e472463ea47e94671678
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Tue Nov 12 13:08:34 2013 -0500

    Update mythpython script for new tmdb library.
    (cherry picked from commit 5c5082a6109df3e3c4ddb99569fcf37af55b97d1)

commit 11cbec350b520b28e0a2c2ae05805fb817acf9a1
Author: Karl Dietz <dekarl@mythtv.org>
Date:   Fri Oct 11 22:23:37 2013 +0200

    actually add the timecodeOffset when getting audio frames
    
    We have to ask the AudioReencodeBuffer for audio to write with the
    original timecode before applying the cut list.
    
    Patch by Nicolas Pöhlmann
    Reviewed by Paul Gardiner
    
    Refs #11213
    Refs #11639
    
    (cherry picked from commit ea8c2b91e91e5cada8f8309f9fcb63f831f79aee)

commit c8fb1323526d394c0d3cb38b13efbccbd0e45400
Author: John Finlay <finlay@moeraki.com>
Date:   Wed Nov 6 19:36:09 2013 +1100

    Fix lossless transcode.
    
    Following 6c3653cd378aacef10b7706d8b7f71beae41274c, lossless mythtranscode got broken.
    
    This is just a quick workaround, the whole code needs to be revisited and properly use FFmpeg API
    
    Fixes #11213
    
    Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
    (cherry picked from commit 2a27e176275155a04498ecb8eac67dbd0164d080)

commit 64a0824f53ce75a68745c16d5ecb7ce946f601d3
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Nov 10 07:56:13 2013 -0800

    Handle system keypress events during playback.  Refs #11881.
    (cherry picked from commit b83e60520062cd338f2b952a8b8bc7aeb0260b27)

commit d31e729827a1a50aae87eb816881547f58c1e68f
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sat Nov 9 07:17:47 2013 -0800

    Respect LiveTVOrder priority when switching sources.
    
    This is the playback OSD menu Playback > Source > Switch Source.
    Refs #10967.
    (cherry picked from commit cb602368945cf42f9072d8187991cff0b025684a)

commit 4e1342491d65d1d2b11e1e0f60bb48da1be7740b
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Nov 8 14:13:08 2013 -0800

    Fix reversed logic in dfe5396.  Refs #11939.

commit 02d88eb79ae2ed969094787f641466137079b0f1
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Nov 6 14:00:00 2013 +0000

    Simplify MythCoreContext::GetMasterHostPrefix(). It's a waste of time to get the IP/port from the socket when we can be using the values from the settings instead, if we're not already connected to the master we will soon be connecting anyway to conduct the file transfer.
    (cherry picked from commit 22b48f435a97b6b973a2e0dea9e89548350bc01e)
    
    Refs #11937

commit dfe53966fb66b9d846a4c2832a97e725bd082543
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Nov 8 06:11:56 2013 -0800

    Mythtranscode: Don't overwrite cutlist from the command line.
    
    Adapted from a patch by John Finlay.  Refs #11939.
    (cherry picked from commit 22409776f5d737dbf8a9b3d31d41498b20a59774)

commit 45459f9f5c63b5a75c65a4e8eafdcfb56822c212
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Thu Nov 7 15:12:03 2013 -0800

    Update ABI version after 1b16c65f465588a8991b730fb23ef0d1c61ed181.

commit 1b16c65f465588a8991b730fb23ef0d1c61ed181
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Thu Nov 7 15:10:43 2013 -0800

    Improve the performance of Live TV embedded in the Program Guide.
    
    Most of the Program Guide's DB and backend queries are moved out of
    the UI loop into a background helper thread, to minimize the chance
    of the embedded Live TV window stuttering.
    
    More work can and should be done to pre-cache scheduler data and
    channel tuning status, and to have the backend invalidate/update it
    when there are changes.
    
    The background computation introduces some guide navigation UI
    oddities, where the expensive-to-compute elements (the list of
    channels) update on the screen slower than other elements.
    
    There is still some slight stuttering on a single-core ION frontend,
    but most frontends should see a vast or complete reduction in Guide
    navigation stuttering.
    
    Refs #11020
    
    (cherry picked from commit 7f2140ce062ade5a5523565b469ff58ada9c0d0d)
    
    Conflicts:
        mythtv/programs/mythfrontend/guidegrid.cpp

commit 0a5c67e424c4e500fa26567216761b46aefbd230
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Nov 6 13:43:16 2013 +0000

    Since IPv6 addresses can contain %{num} as the zone index, it's not safe to use QString::arg() in GenMythUrl(). Potentially fixes #11937
    (cherry picked from commit 08b2525642ef1defa1390a4dbf35d5a3d2993147)

commit ea5af9081d46b566b638856204793c7ddc032da4
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Oct 19 14:05:23 2013 +0100

    Services API: Fix aggregation of channel and program information in GetProgramGuide()
    (cherry picked from commit 7c8e274633cea2684171e8d2daafe61b2e9732f5)

commit 923bd98200a96c1a4f3d957e46e1d02ccf224103
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Oct 19 01:02:41 2013 +0100

    Services API: Order programs in GetProgramGuide() by starttime
    (cherry picked from commit a180bbc1b89290128ac617e8a640740ada3f0690)

commit 9d1f4a6c2ac0db242b02a8fd32b9c15c11ffa0cf
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 25 18:51:04 2013 +0100

    Fix the disappearing programs bug in the Service API
    (cherry picked from commit 0f3d24e2b478f51b1b8360386cbf97a375b1dfac)

commit 2a4ede8b997f27e7ff52c4f4c2c15ace3b135ce9
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 25 20:56:42 2013 +0100

    Fix inclusion of year of release in services Program object.
    (cherry picked from commit 5fde814375e6d87ad42d3eade9bed100e358f876)

commit 79f9a9ebde7cc012f7bf73078d7055465c3a12d9
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Tue Oct 29 15:07:33 2013 +0000

    Fix kVideoPropertyMask, we want 7 bits, not 6
    (cherry picked from commit a69babcffb80c58d17138219e89cd3150a5510ec)

commit 916dd9cdcb99410f9ef80329ccc7ae79cbba2565
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Nov 2 13:06:25 2013 +0000

    Services API: Fix 'reverse' sorting in Dvr::GetRecordedList()
    
    Problem spotted by Jonatan Lindblad
    (cherry picked from commit 22c59c882f84356ff28b50243620278fed314b4d)

commit d7c8faa567fb1f301eceb16adeb8463e7738488c
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Tue Oct 29 23:39:00 2013 +0000

    MythZoneMinder: get a normal frame image if an analysis image is not available
    
    Continuous (record) events don't produce any alarm frames so no analysis images
    are produced.  It is also possible to turn analysis image creation off even for
    alarm events so fall back to returning a normal frame image if no analysis
    image is found.
    
    Fixes #8912
    
    (cherry picked from commit f7d05529b1980638729f2e232fc46c346fe78a0e)

commit 27e74e2399133a0aed12fcd41215154c891aaa02
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Tue Oct 29 22:31:49 2013 +0000

    MythZoneMinder: fix playback of continuous events
    
    Not every frame is stored in the database for continuous events so their
    playback was broken. This fixes the problem by reading the number of frames
    and the event time from the DB and interpolating the frame list and time deltas
    from that.
    
    Refs #8912
    
    (cherry picked from commit 68f98331c2e2053e803d6237eacb75a7294c2825)

commit 84c700b926a07f4780c7c74fa851438dc20f72d9
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Thu Oct 31 22:35:13 2013 +0000

    MythZoneMinder: fix the monitor function popup on the console screen
    
    The popup was only allowing the first monitor to be changed.
    
    (cherry picked from commit 1e3d70b1b0ef74615c7f7f59e1bfef3621842a3e)

commit 8845997d30dd093ea35426dca80222f7ab0c4a8f
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Tue Oct 29 19:51:58 2013 -0400

    Manually apply logging arguments when running mythfilldatabase.
    
    This manually applies the logging arguments to mythfilldatabase when run
    automatically through the housekeeper, to ensure logging arguments are
    in place ahead of potentially conflicting user-defined arguments.

commit b5f24f8886f05222dcec82a0ea2e15a448bbb4d7
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Mon Oct 28 22:05:56 2013 +0000

    MythZoneMinder: tidy up the default wide zmliveplayer
    
    (cherry picked from commit e43fbd4ef7f1879c69812721ba5b45633ea5c556)

commit 58151587b81a0071fee6655c99c06cfbb6855be8
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Mon Oct 28 21:27:59 2013 +0000

    MythCenter-wide: Add the six and eight camera layouts to the ZM live screen
    
    (cherry picked from commit bb66f3156605ac288cc2777c8530c25ed80908aa)

commit 86fbdb75c1e1c13cc4c45d77ad35bed695894b17
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Mon Oct 28 21:13:16 2013 +0000

    MythZoneMinder: Add the six and eight camera layouts to the 4:3 ZM live screen
    
    (cherry picked from commit 29cc89dbaa955d3cda1212ec0f648dfd8f0108df)

commit 821df49906463cb3ea5f503b47f1cdd92b95705f
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Oct 27 22:31:22 2013 +0000

    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)

commit eff6257a6cd2ada2d64ae3dfcb9346cd0246a563
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Oct 27 10:10:10 2013 +0000

    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)

commit 911e19487fe1fead2bacec416b3c0f864bf7b68e
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Tue Oct 29 17:23:12 2013 +0000

    Fix marking of 1080/720 videos.
    (cherry picked from commit 7ed0e5fb3dd90eca4eb9cdf8371be11e80a41fa6)

commit 29eab516202aa76aeb769ed636c183ba3ed0efcf
Author: John Poet <jpoet@mythtv.org>
Date:   Wed Oct 23 12:20:57 2013 -0600

    Any V4L card may need to preset the tuner.
    
    Refs [a3cdcf573]
    
    (cherry picked from commit c649ee2c2d01ad2dbb95646ec75b78294a4f3709)

commit 6ecb83e8454e54eb7bf521c8b3eb111e99e35e4a
Author: dev-team <dev-team@tikinou.com>
Date:   Wed Oct 23 10:18:22 2013 -0400

    Fixes #11905 - HttpRequest parsing fails on parameters containing encoded & character

commit ccf877d318a9d976fababe32628d8de765ccfc29
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Mon Oct 21 06:58:31 2013 -0700

    Bump ABI version after 9ecf7a69ffc00d3f03dbb4c7a611a02d1f19f702.

commit 9ecf7a69ffc00d3f03dbb4c7a611a02d1f19f702
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 20 15:50:31 2013 -0700

    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)

commit c160ce21b9c493eaa7c911e3e2ca031b823678b2
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 20 16:20:31 2013 -0700

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

commit 83fb4079e92079db83c7d2a622c210610d688012
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 20 16:20:18 2013 -0700

    Revert "Allow Live TV to be entered from the top-level Program Guide."
    
    This reverts commit 7555b69babe1e600a33978ecf0d60756bf391e40.

commit 7555b69babe1e600a33978ecf0d60756bf391e40
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 20 15:58:50 2013 -0700

    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.

commit 7ed0e9dc03ccd542567dee8b27724438166aa3b7
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 20 15:50:31 2013 -0700

    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.

commit 7323c328dea2094edb369433092696a06cd3b243
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Wed Oct 16 14:59:07 2013 -0700

    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)

commit 1e5d2479f50f584a3235dea5e2633709dc9ba82b
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 18 15:13:35 2013 +0100

    Fix services GetChannelIcon() when height or width are specified
    (cherry picked from commit 15b82903a101eb2111889fb2c9600181f122dcce)

commit 1c8602a167c465610182edd95cf47adc60b982c8
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Oct 17 22:57:03 2013 +0100

    Revert "Add ChannelIcons to the list of "special" storage groups."
    
    This reverts commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6.
    
    See 3d95e17

commit 93ada424fc4c307f6408b47aef1912d9d4c07ec9
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Thu Oct 17 15:24:32 2013 +1100

    decode URL before attempting to open them.
    
    Thanks to Chris Pinkham for finding the root cause.
    
    Fixes #11909
    
    (cherry picked from commit cba3bc592f837b4680c2ec8075502b9323bdd3fe)

commit 88f380d100ca3e85c3ae26156eae8eb8b24400f6
Author: skd5aner <skd5aner@gmail.com>
Date:   Wed Oct 16 21:01:48 2013 -0400

    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

commit 85462fbc670eb3efc4d3d66cf4708541a51199f1
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Oct 16 16:02:54 2013 +0100

    Use the ChannelIcon storage group in the services API Guide/GetChannelIcon()
    (cherry picked from commit d21c685f62c58e596ce1ece86e85040285eb0ccd)

commit 23131d313097cdd6bec8ea65633afb453248ef9c
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sun Oct 6 16:40:40 2013 +0100

    Disable MHEG/ITV when generating previews or flagging commercials
    (cherry picked from commit bc62d105d6cd594e18c8d0674902916d3b00d37b)

commit 1224f055aa7960ffe2d6bfcd71300ff90d7e6b93
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Sep 19 12:31:15 2013 +0100

    Make sure callbacks are disabled when the slave backend ANNounces.
    
    Refs #11867
    (cherry picked from commit 84fa3fe02d6731d06b4d64573253710405767923)

commit 0095fd137188545ec18faa4116861fd524cbe81b
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Sep 18 14:50:27 2013 +0100

    Prevent the use of SendReceiveStringList() on a socket with callbacks. Fixes #11777
    (cherry picked from commit 836eb11d96abfaa5986e7382103db69769b0ae47)

commit 1a3639a3f0851d3d124d1904e029739499f5685f
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Oct 11 06:53:53 2013 -0700

    Update binary version after [aaa418e].

commit aaa418ef1dcd6973ec2db564f6c3c78fe7ad4096
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sun Oct 6 11:21:50 2013 -0700

    Add mythutil --getmarkup and mythutil --setmarkup commands.
    
    This extracts the contents of the recordedmarkup, recordedseek, and
    filemarkup tables to or from a local xml file.  The primary reason is
    to allow users to extract recorder seektable information as needed and
    attach it to a ticket, for a developer to use for debugging.  Example:
    
      mythutil --chanid xxx --starttime yyy --getmarkup /tmp/markup.xml
      mythutil --video zzz.mpg --setmarkup /tmp/markup.xml
    
    An added benefit is to be able to copy metadata (e.g. seektable,
    commskiplist, cutlist) between isolated MythTV instances.
    (cherry picked from commit dafb81abcf8955112037d2e7e230ebb8eb068886)

commit db1b1c87bea4555fe51786e6b2c16fafdd030fea
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Sep 20 06:12:33 2013 -0700

    Mythutil: Allow --video instead of --chanid/--starttime.
    
    This applies to the markup utils.  Refs #10804
    (cherry picked from commit 97a309a04f017fcfbdb2004a12008e1f563b141c)

commit 95d94e291c3113b93e705c0fc72c8f087704d991
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Oct 11 06:10:22 2013 -0700

    Add missing toUTC() conversions in the preview generator.
    
    Without these conversions, modification timestamps on
    backend-generated preview files are reported in local time, but
    interpreted by the frontend as UTC.  The frontend then converts this
    to local time and uses that to set the modification timestamp of the
    locally cached preview, effectively back-dating the cached file in
    most time zones.  This messes up date comparison logic for determining
    whether to regenerate or reload the preview image.
    (cherry picked from commit ad18e3d69c19ab6e197e15d285844ccb49e16795)

commit 42be114b97c095bcd0f9a35a9419dbe31538c086
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Thu Oct 10 19:18:53 2013 -0400

    Bump binary version.

commit 9bfed2b0989f92dc4f98401c968a59ae9238da5d
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Thu Oct 10 18:56:34 2013 -0400

    Add back ArtworkTask enable check... properly.
    
    This adds the check for DailyArtworkUpdates back to ArtworkTask,
    following its reversion in ca3a79bf407, but properly runs the
    PeriodicHouseKeeperTask check so it does not requeue once per minute.
    
    Refs #11902
    (cherry picked from commit 7905afdd4fc7d9ee2eb1bf97bffe0f6e003cc1e9)

commit e72f3375f4176d3ed12eb91ce7732143860fdf19
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Thu Oct 10 18:47:16 2013 -0400

    Add secondary check to prevent housekeeper task from running twice.
    
    This adds an extra check to prevent a HouseKeeperTask from running
    more than once simultaneously. This prevents an issue seen in a
    misconfigured child task that was queued in concurrent passes. One
    instance had not yet finished when the second one started a minute
    later, and overwrote a shared pointer, eventually resulting in a
    segmentation fault.
    
    Cause spotted by Jonatan Lindblad.
    
    Refs #11902
    (cherry picked from commit c712ed04255fe416d95a674ed50e045d864759e8)

commit cd6df2c8007913680bdb90f544d5a6b81f560ffa
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Oct 10 22:18:25 2013 +0100

    Revert "Have backendhousekeeper check for artwork update boolean."
    
    This reverts commit 3798a07098272be9f04902ec71874b0d2fb1308d.

commit d05c10e9fd105bc8ed6caccd0f132b8ec64767d2
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Thu Oct 10 17:47:45 2013 +1100

    Improve AirPlay device visibility in iOS 7
    
    For some reasons, my iPhone doesn’t always show mythtv as an AirPlay device, and more often than not only show it as an audio device.
    After playing a lot with the various bonjour advertising data, what I can gather is:
    - If AirPlay video reports a version >= 120.x; the iPhone will attempt to use FairPlay DRM no matter what RAOP reports (even if it reports no support for encryption)
    - If there’s a mismatch of version between AirPlay video and RAOP: the iPhone 5 won’t show the video service
    - If reporting a version < 110 in AirPlay video, then photo sharing doesn’t reliably work
    - If bit 10 in features bitmask is cleared, it doesn’t reliably show up
    So I set the AirPlay video version to 115.3 (made up value) that allows photo sharing, and RAOP also to 115.3 and it all seem to work nicely now
    
    (cherry picked from commit 7e2f21c8a3614fe059abed3801aafd6dbc1ed07a)

commit aa362d70accb74cf3fe6bfdfd85e9a7b421aaf46
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Thu Oct 10 13:34:31 2013 +1100

    Do not display background shape in fullscreen notification if there’s nothing in it
    
    So nothing cover a photo when using AirPlay photo sharing
    
    (cherry picked from commit 92f02ac76c7011420b3e2981210826f651dc65da)

commit e59e5f63de5f5c3fda1b58b2cf8e370c96c6337c
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Wed Oct 9 01:08:53 2013 -0400

    Perform run checks for housekeeper tasks set to run on startup.
    
    This may need some rethinking if we want a way to bypass the checks and
    force something to run on startup.
    (cherry picked from commit 4d07f2804c64f1f045480fa1f882050b2fcb3111)

commit 3798a07098272be9f04902ec71874b0d2fb1308d
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Wed Oct 9 01:08:10 2013 -0400

    Have backendhousekeeper check for artwork update boolean.
    (cherry picked from commit f4669d6c1b752b943b2b2f04c7382445b88a3d70)

commit 756d95d85f9d2049b667edeb269668b502839418
Author: David Engel <dengel@mythtv.org>
Date:   Mon Oct 7 13:25:14 2013 -0500

    Always use current time when entering EPG from live TV.
    
    Backported from master.
    
    Refs #11891

commit 77db95785de9b80f87b96a46220124a1fcc50bf8
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Oct 5 21:30:45 2013 +0100

    Use MythDate::fromString() instead of QDateTime::fromString()

commit a8e3b71249d7871ae5f2f62d9944e588c20843b1
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Sat Oct 5 00:26:29 2013 +0100

    Ensure the date we pulled as a string from the database is actually valid

commit 46d8c2392429113e40be9a7dcc3dd392c625b8d7
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Fri Oct 4 06:59:05 2013 -0700

    Bump the ABI version after 990757a.  Refs #11415.

commit 990757a60e43c7054876eee5de4cc25a5a301022
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Sat Sep 28 07:43:12 2013 -0700

    Provide better seeking and position display for some videos.
    
    Specifically, there are examples of poorly-encoded avi files that
    report a video frame rate of 30fps but the video stream is actually
    24fps.  Because frame intervals are actually encoded as 30fps, every
    4th frame has to be repeated.  Without an adjustment to framesPlayed,
    translations between MythPlayer's frame-based seeking/display and
    ffmpeg's timecode-based seeking drift out of sync.
    
    Note: Similar adjustments may be necessary if frames have to be
    dropped due to a frame rate mismatch.
    
    Refs #11415.
    (cherry picked from commit e7a8dfc62226f3b192559828e43f3396640c7c0e)

commit c6f2e2f8f63ba113889db43327f30e4b834f4363
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 4 14:33:39 2013 +0100

    Add some logging to show what is happening with the startup shutdown block.

commit b3a827da3bc425581d9ea17e136dd704eb70bc6b
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 4 14:13:20 2013 +0100

    Fix startup 'wait for client' check that assumed the client would be non-blocking. It's possible for a frontend to connect to the backend, then go idle before we re-checked for it's presence, which would have prevented the backend shutting down. If _any_ client is connected, then release the block on shutdown.
    (cherry picked from commit 7e0fa3f28320ca658ef2e1945e3f1919bb6e2022)

commit 0536d476d9d2e2f5468022d784f4bf17742b7e78
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 4 13:27:53 2013 +0100

    More robust checks before blocking shutdown for a mfdb run in the near future
    (cherry picked from commit a269f9538763c426414e7dc9dd6d93d3329e2156)

commit 4a7ea0f469e64a85d42e6c9c88944f5be11ca193
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Fri Oct 4 13:17:36 2013 +0100

    Add more logging HandleIdleShutdown() to give a clearer picture of what's happening
    (cherry picked from commit be074d181b21b4107d7084d1dd6648820ed5aaed)

commit c8e45cbde2f4fc628364b0ea0c4989cbf3a56f70
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Oct 3 23:04:38 2013 +0100

    Fix compilation on Windows

commit 7ed4e40da216e96c615a22d9d7879fb16b26f16a
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Oct 3 22:48:22 2013 +0100

    More robust check before using mfdb run time as wakeup time
    (cherry picked from commit d9f5a172d3024216b5c7b6d3e8b8ccc8e40ed3e2)

commit 89fb9d45b6584ce948c26eece0494ac6614becd9
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Thu Oct 3 13:35:37 2013 +0100

    Wakeup the backend to run mythfilldatabase
    
    This uses MythFillSuggestedRunTime, for xmltv sources (+24 hours), for
    datadirect whatever time was suggested by TMS to ensure that we always
    wake up the backend to collect guide data (xmltv, DD only, EIT is not
    yet supported). Using MythFillSuggestedRunTime is a bit of a hack, but
    it's already set for Schedules Direct so this was the simplest
    solution.
    
    For now the "Run guide data program at time suggested by the grabber"
    setting MUST be enabled for this to work as intended.
    
    Without this fix the backend won't wake up to grab guide data from
    xmltv/SD sources and that may result in it eventually running out of data
    entirely.
    (cherry picked from commit b27bba2921b6aed801173de8ae2707dd958b75f3)

commit 6ff9ea0dc2d977c013e6fbdafc5ba2ad24d68248
Author: Stuart Morgan <smorgan@mythtv.org>
Date:   Wed Oct 2 19:37:29 2013 +0100

    Replace usage of direct queries on the settings table with SaveSetting() in MythFillDatabase
    (cherry picked from commit 4629d336e30a62945a557fc8aa1602634aa09f24)

commit 7ae9f17e658f37cd46ef5c44d1ce579369dc34ca
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Wed Oct 2 03:20:26 2013 +1000

    Revert "Properly propagate quiet log option"
    
    This reverts commit a74baed2bbf3a72f2af58fe684398d3fdd01f256.
    
    (cherry picked from commit 445a73793de9f21a512232a8a82c34372aac379b)

commit 74356081e9271845f7b212cddfde29c229b33bc3
Author: Jean-Yves Avenard <jyavenard@mythtv.org>
Date:   Wed Oct 2 03:20:01 2013 +1000

    Remove unnecessary command option, all we are doing is adding —nologserver twice
    
    (cherry picked from commit 996f652f0f143513bdbe9e5510714f776c9cd44f)

commit 79208f2c937a7211a19d9985154ad0ce280dde92
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Tue Oct 1 06:34:54 2013 -0700

    Fix an apparent copy&paste error.  Refs #11885
    (cherry picked from commit ba7d683767140a2ddf31664454da40ea4e63d6d3)

commit a179aae608c7aa0ee80620267df7773c5fa4b75f
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Wed Sep 25 10:58:21 2013 +0100

    MythZoneMinder: fix the grabbing of the live stream images
    
    * Add a missing field to the ShareData struct added it later ZM versions
    * Change the minimum supported ZM version to 1.24.0.
    * Remove the v4l2 hack
    
    Note: this bumps the MythZoneMinder protocol version so both the FE plugin
    and mythzmserver need to be updated.
    
    Refs #8182
    
    (cherry picked from commit b1867bd45765157432f5598aa26377fb922ed116)

commit d9561055abeec11fba234c9bdfbde5e79e695803
Author: Jim Stichnoth <jstichnoth@mythtv.org>
Date:   Tue Sep 24 06:38:25 2013 -0700

    Clear duration and framecount flags with mythutil --clearseektable.
    
    Otherwise those flags are hard to get rid of when mythcommflag
    --rebuild doesn't produce a correct seektable for some reason.
    (cherry picked from commit c4f0c0c57c87c4bfe2e9d143648df2a02c44d578)

commit b6a657478df796c810c788922a545d84f36e7129
Author: David Engel <dengel@mythtv.org>
Date:   Mon Sep 23 13:26:45 2013 -0500

    Fix startts copy & paste error in previous ForgetHistory() change.
    
    Also, do use subtitle & description semantics when the original
    information is no longer available, but do it in a way that can be
    easily detected and works in all code paths.
    
    (cherry picked from commit d2231e90b3f581c69e12cd376324a6b8cdf9ac65)

commit 2ccd08f72b3d445b9a768bf72da25749326821d9
Author: David Engel <dengel@mythtv.org>
Date:   Mon Sep 23 12:29:09 2013 -0500

    Change RI::ForgetHistory() to use dupmethod when available.
    
    Previously, ForgetHistory() implicily used subtitle and description as
    the duplicate check method.  Consequently, it doesn't always match
    correctly when other methods are used and there are guide changes in
    data that should be ignored.  In addition, don't assume any dupmethod
    in the Previously Recorded screen to avoid being to overzealous when
    called from there.
    
    (cherry picked from commit 567cba3184db0e5801dc1ae7736d5d778ec2d96c)

commit 4ae99828b0b82a8498eb0af986dfbceb626f739c
Author: Paul Harrison <pharrison@mythtv.org>
Date:   Sun Sep 22 23:45:54 2013 +0100

    MythMusic: fix playback of ogg radio streams
    
    Peek the probe data from the stream buffer rather than read the data otherwise
    ffmpeg fails to open the stream because the magic it is looking for has already
    been read from the stream.
    
    Also increase the probe buffer to 16K this seems to be required for some ogg
    streams to be probed properly.
    
    (cherry picked from commit 6b09d7c629e4efac81276eee9f4b7cbe3bc661ef)

commit b2486bae6d57bdd8aa78301da7f43982ae5dba73
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Sep 21 17:43:51 2013 -0400

    Update Python bindings version.

commit 3d7ac5c2d71f91990bdf73eab2299bc4caf5f278
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Sep 21 17:42:35 2013 -0400

    Remove more tmdb bits.
    (cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6)

commit 6d4572a88c1c785cf5b6e6a38256b82d6fded148
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Sep 21 17:38:33 2013 -0400

    Remove tmdb library from python installer script.
    (cherry picked from commit 9c0dfbc9f6b753a5b3d6f2e294baaf9577519a91)

commit db4167ec3d1396c81d00d3fe71b6ca104880136d
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Sep 21 17:23:05 2013 -0400

    Remove tmdb.py and associated library.
    (cherry picked from commit 53c272dc4ffe2f5392ff54fb3e446801395274fb)

commit adcda83028125dd6a26f69513ee99da2e7302be3
Author: Raymond Wagner <rwagner@mythtv.org>
Date:   Sat Sep 21 16:59:06 2013 -0400

    Allow system calls to pull global settings from the database.
    
    This adjusts the System() class to first try local settings of the
    supplied value, fall back to global settings, and then the supplied
    default, before finally erroring. This corrects an issue where the
    VideoGrabber() child class did not properly pull the global settings for
    TelevisionGrabber and MovieGrabber, and thus just used the internal
    defaults.
    (cherry picked from commit 4e072b2de29c32c4d00fe62849feadd80d2c0c02)

commit 5b917e8d6548c40f3c6df0dcd18a090d90995306
Author: Jonatan Lindblad <jlindblad@mythtv.org>
Date:   Wed Sep 18 23:24:45 2013 +0200

    Update the Swedish translation.
    
    Update of the Swedish translation for mythfrontend and all plugins made
    by me and Roger Mårtensson (thank you!).
    
    (cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c)
