[vdr-plugin-markad] 03/07: Merge tag 'upstream/0.1.4+git20150212'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-markad.

commit 378bdde0410ef608db2d569830e084341c1aba0b
Merge: 3c0226d 661d5de
Author: etobi <git at e-tobi.net>
Date:   Thu Feb 12 22:00:01 2015 +0100

    Merge tag 'upstream/0.1.4+git20150212'
    
    Upstream version 0.1.4+git20150212

 .gitignore                                         |  15 ++
 AUTHORS                                            |   1 +
 Makefile                                           |   7 +-
 command/Makefile                                   |   5 +-
 command/decoder.cpp                                | 116 +++++----
 command/decoder.h                                  |   1 +
 command/demux.cpp                                  |  37 +--
 command/demux.h                                    |   1 +
 command/global.h                                   |   1 +
 ...LS_4_Austria-A16_9-P0.pgm => 3sat-A16_9-P0.pgm} | Bin 19219 -> 19254 bytes
 command/logos/ATV-A16_9-P0.pgm                     | Bin 10018 -> 19219 bytes
 command/logos/ATV-A16_9-P2.pgm                     | Bin 2497 -> 4817 bytes
 ...el_eins_HD-A16_9-P0.pgm => ATV_HD-A16_9-P0.pgm} |   4 +-
 ...ustria-A16_9-P0.pgm => AXN_Action-A16_9-P0.pgm} |   2 +-
 command/logos/DMAX-A16_9-P0.pgm                    | Bin 10728 -> 11218 bytes
 ...L_HD-A16_9-P0.pgm => Das_Erste_HD-A16_9-P0.pgm} |   6 +-
 ...HD-A16_9-P0.pgm => Deluxe_Music_HD-A3_2-P0.pgm} |   4 +-
 ...ia-A16_9-P0.pgm => Disney_Channel-A16_9-P0.pgm} |   6 +-
 ...-A16_9-P0.pgm => Disney_Channel_HD-A4_3-P0.pgm} |   4 +-
 ..._Austria-A16_9-P0.pgm => EinsPlus-A16_9-P1.pgm} |   4 +-
 ..._Austria-A16_9-P0.pgm => EinsPlus-A16_9-P2.pgm} |   4 +-
 ...Austria-A16_9-P0.pgm => Fox_Serie-A16_9-P0.pgm} |   2 +-
 ..._Austria-A16_9-P0.pgm => Fox_Serie-A4_3-P0.pgm} |   2 +-
 ...stria-A16_9-P1.pgm => MDR_Sachsen-A16_9-P0.pgm} | Bin 4817 -> 4817 bytes
 ...S_4_Austria-A16_9-P0.pgm => N24_HD-A4_3-P0.pgm} |   4 +-
 ...S_4_Austria-A16_9-P1.pgm => N24_HD-A4_3-P1.pgm} | Bin 4817 -> 6417 bytes
 ...S_4_Austria-A16_9-P1.pgm => N24_HD-A4_3-P2.pgm} | Bin 4817 -> 6417 bytes
 ...Austria-A16_9-P0.pgm => NDR_FS_HH-A16_9-P0.pgm} | Bin 19219 -> 19254 bytes
 ...Austria-A16_9-P0.pgm => NDR_FS_MV-A16_9-P0.pgm} | Bin 19219 -> 19254 bytes
 ...ustria-A16_9-P0.pgm => NDR_FS_NDS-A16_9-P0.pgm} | Bin 19219 -> 19254 bytes
 ...Austria-A16_9-P0.pgm => NDR_FS_SH-A16_9-P0.pgm} | Bin 19219 -> 19254 bytes
 ...4_Austria-A16_9-P0.pgm => ORF1_HD-A16_9-P0.pgm} |   6 +-
 ...ustria-A16_9-P0.pgm => PHOENIX_HD-A16_9-P0.pgm} | Bin 19219 -> 20019 bytes
 ...ustria-A16_9-P1.pgm => PHOENIX_HD-A16_9-P1.pgm} | Bin 4817 -> 5018 bytes
 ...ustria-A16_9-P1.pgm => PHOENIX_HD-A16_9-P2.pgm} | Bin 4817 -> 5018 bytes
 command/logos/PULS_4_Austria-A16_9-P0.pgm          | Bin 19219 -> 10258 bytes
 command/logos/PULS_4_Austria-A16_9-P1.pgm          | Bin 4817 -> 2577 bytes
 command/logos/PULS_4_Austria-A16_9-P2.pgm          | Bin 4817 -> 2577 bytes
 ..._Austria-A16_9-P0.pgm => ProSieben-A4_3-P0.pgm} | Bin 19219 -> 19254 bytes
 command/logos/ProSieben_MAXX-A16_9-P0.pgm          | Bin 0 -> 7212 bytes
 ...A16_9-P0.pgm => ProSieben_MAXX_HD-A16_9-P0.pgm} |   4 +-
 ...{SIXX-A16_9-P0.pgm => RSI_LA_1_HD-A16_9-P0.pgm} | Bin 13193 -> 17266 bytes
 .../logos/{SIXX-A16_9-P0.pgm => RTL-A16_9-P0.pgm}  | Bin 13193 -> 12018 bytes
 ...{SIXX-A16_9-P0.pgm => RTS_Deux_HD-A16_9-P0.pgm} | Bin 13193 -> 14418 bytes
 .../{ATV-A16_9-P0.pgm => RTS_Un_HD-A16_9-P0.pgm}   | Bin 10018 -> 11538 bytes
 ...-A16_9-P0.pgm => SAT_1_HD_Austria-A16_9-P0.pgm} |   4 +-
 command/logos/SF_1_HD-A16_9-P0.pgm                 |   5 +
 command/logos/SF_zwei_HD-A16_9-P0.pgm              |   5 +
 command/logos/SF_zwei_HD-A16_9-P1.pgm              | Bin 0 -> 6882 bytes
 command/logos/SF_zwei_HD-A16_9-P2.pgm              | Bin 0 -> 6882 bytes
 command/logos/SIXX-A16_9-P0.pgm                    | Bin 13193 -> 13193 bytes
 command/logos/SIXX_HD-A16_9-P0.pgm                 |   4 +-
 ..._eins_HD-A16_9-P0.pgm => SPORT1_HD-A4_3-P0.pgm} |   4 +-
 ..._Austria-A16_9-P0.pgm => SUPER_RTL-A4_3-P0.pgm} |   4 +-
 command/logos/SUPER_RTL_HD-A16_9-P0.pgm            |   4 +-
 ...ULS_4_Austria-A16_9-P0.pgm => ZDF-A16_9-P0.pgm} | Bin 19219 -> 19219 bytes
 ...ustria-A16_9-P0.pgm => ZDFinfo_HD-A16_9-P0.pgm} |   6 +-
 ...ER_RTL_HD-A16_9-P0.pgm => arte_HD-A16_9-P0.pgm} |   4 +-
 command/logos/kabel_eins_HD-A16_9-P0.pgm           |   4 +-
 command/logos/kabel_eins_HD-A16_9-P1.pgm           | Bin 10537 -> 12978 bytes
 command/logos/kabel_eins_HD-A16_9-P2.pgm           | Bin 10537 -> 12978 bytes
 ...ria-A16_9-P0.pgm => zdf_kultur_HD-A16_9-P0.pgm} |   6 +-
 command/markad-standalone.cpp                      | 280 +++++++++++++++------
 command/markad-standalone.h                        |   4 +-
 command/markad.1                                   |   2 +-
 command/marks.cpp                                  |   1 +
 command/streaminfo.cpp                             |  16 ++
 command/video.cpp                                  | 183 ++++++++++----
 command/video.h                                    |  40 ++-
 plugin/HISTORY                                     |   1 +
 plugin/Makefile                                    |   7 +-
 plugin/README                                      |   1 +
 plugin/markad.cpp                                  |   1 +
 plugin/po/de_DE.po                                 |   5 +-
 plugin/po/es_ES.po                                 |   5 +-
 plugin/po/fi_FI.po                                 |   5 +-
 plugin/po/it_IT.po                                 |   5 +-
 plugin/po/sk_SK.po                                 |   5 +-
 plugin/setup.cpp                                   |  61 +++--
 plugin/setup.h                                     |   4 +-
 plugin/status.cpp                                  |  53 +++-
 plugin/status.h                                    |   2 +-
 version.h => version.dist                          |   2 +-
 83 files changed, 664 insertions(+), 305 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-markad.git