[mythtv-firehose] mythtv branch devel/iptv updated by jyavenard. v0.28-pre-1349-g33064ac

[Git Repo Owner]

The branch, devel/iptv has been updated on the
mythtv repository by gitolite user jyavenard.
       via  33064ac7191158a5c59bc6fa5c9277bcc9a30e3c (commit)
       via  ea57f3bbafff496f09e4369ff46886f2a4d88f9b (commit)
       via  57b64c4af16aedee1608119f8e68ee01e2343d6f (commit)
       via  0ff1bd335532eb52a005200f9a7feec1b12b7f4b (commit)
       via  672c46994d23b4717ae184b8b84e9a911c5d4007 (commit)
       via  8feac897642810ebfb31788a2494e37df1538677 (commit)
       via  8c2631a591375081561c360ab4a58269b7876682 (commit)
       via  da49bf7a64b0e3adc9c38d360c9fd45af52927cd (commit)
       via  fc5a62158cd45e3067ebd9d289b7b85626a48d24 (commit)
       via  cc8c77912d5c388d7ac710615955dc1c2475a88e (commit)
       via  aefe1e3c89a410178145f7b7a788b041841c6ffa (commit)
       via  2a5f3c8ca5d750415b8227ff2f74c3bf2cd5119d (commit)
       via  8af587a2c49d5411db0b46530f111e9aba85d72f (commit)
       via  0a715bf3da19a0ac5e42b3f8ed6133ef71c163fc (commit)
       via  b3c6b93176fb9998a7fe3ed120910ab2999ee1de (commit)
       via  7ee573ae67992c2f4c34c300740be713f82d1e98 (commit)
       via  73037c4ecd36eaf7ff35504f524344d1ab5a3f18 (commit)
       via  752cbb5e818b58321256c810a4aa8534c13fb339 (commit)
       via  eb17a56d137c76cf8a84c43d192b72d93338ccf5 (commit)
       via  d0e25acac0cd671cb1eee4bb965bbcd35ffd88da (commit)
      from  d44b90eb032e71f74f50640c4390d8e4e2ecf4cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33064ac7191158a5c59bc6fa5c9277bcc9a30e3c
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 11 May 2014 21:45:30 +0930
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 11 May 2014 21:45:30 +0930
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=33064ac7191158a5c59bc6fa5c9277bcc9a30e3c

Merge branch 'master' into devel/iptv
Conflicts:
	mythtv/libs/libmythtv/recorders/cetonrtsp.h
	mythtv/libs/libmythtv/ringbuffer.cpp



-----------------------------------------------------------------------

Summary of changes:
 .../mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml  |    4 -
 .../mythburn/encoder_profiles/ffmpeg_dvd_pal.xml   |    4 -
 .../mytharchive/mythburn/scripts/mythburn.py       |    6 ++
 mythplugins/mythmusic/mythmusic/musicplayer.cpp    |    5 +-
 mythplugins/mythnews/mythnews/newssite.cpp         |   15 +++++
 mythtv/libs/libmyth/programtypes.h                 |    2 +-
 mythtv/libs/libmythtv/cardutil.h                   |    2 +-
 mythtv/libs/libmythtv/decoderbase.cpp              |    8 +-
 mythtv/libs/libmythtv/decoderbase.h                |    6 +-
 mythtv/libs/libmythtv/eitcache.cpp                 |   60 ++++++++++++++------
 mythtv/libs/libmythtv/eitcache.h                   |    2 +
 mythtv/libs/libmythtv/recorders/cetonrtsp.h        |    2 +
 mythtv/libs/libmythtv/recorders/recorderbase.cpp   |   10 ++--
 mythtv/libs/libmythtv/recorders/recorderbase.h     |    6 +-
 mythtv/libs/libmythtv/tv_rec.cpp                   |    4 +-
 mythtv/libs/libmythtv/videosource.cpp              |    5 +-
 mythtv/libs/libmythtv/videosource.h                |    2 +
 mythtv/libs/libmythui/mythuibuttonlist.cpp         |   26 ++++++++-
 mythtv/libs/libmythui/mythuibuttonlist.h           |    1 +
 19 files changed, 118 insertions(+), 52 deletions(-)

--