[vdr-plugin-femon] 02/03: Merge tag 'upstream/2.2.1'

[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-femon.

commit 7ae7858397a4528e746ccd2b64057a9dbdcfb27a
Merge: ad3b06b 8f78214
Author: etobi <git at e-tobi.net>
Date:   Thu Sep 3 18:34:10 2015 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 HISTORY                               |   6 +
 Makefile                              |  17 +-
 femonaac.c => aac.c                   |  40 +-
 aac.h                                 |  26 ++
 femonac3.c => ac3.c                   |  44 +-
 ac3.h                                 |  28 ++
 femonaudio.h => audio.h               |  34 +-
 femoncfg.c => config.c                |  46 +-
 config.h                              | 136 ++++++
 femon.c                               | 294 +++++--------
 femonaac.h                            |  26 --
 femonac3.h                            |  28 --
 femoncfg.h                            |  81 ----
 femonclient/vdr-femonclient-0.0.6.tgz | Bin 9294 -> 0 bytes
 femonh264.h                           |  64 ---
 femonlatm.h                           |  27 --
 femonmpeg.h                           |  31 --
 femonosd.h                            | 100 -----
 femonreceiver.c                       | 250 -----------
 femonreceiver.h                       | 178 --------
 femontools.h                          |  91 ----
 femonh264.c => h264.c                 | 224 +++++-----
 h264.h                                |  64 +++
 femonlatm.c => latm.c                 |  48 +-
 latm.h                                |  27 ++
 log.h                                 |  48 ++
 femonmpeg.c => mpeg.c                 |  74 ++--
 mpeg.h                                |  31 ++
 femonosd.c => osd.c                   | 808 +++++++++++++++++-----------------
 osd.h                                 | 102 +++++
 po/de_DE.po                           | 192 ++++----
 po/es_ES.po                           | 192 ++++----
 po/et_EE.po                           | 192 ++++----
 po/fi_FI.po                           | 192 ++++----
 po/fr_FR.po                           | 192 ++++----
 po/hu_HU.po                           | 192 ++++----
 po/it_IT.po                           | 192 ++++----
 po/lt_LT.po                           | 192 ++++----
 po/ru_RU.po                           | 192 ++++----
 po/sk_SK.po                           | 192 ++++----
 po/uk_UA.po                           | 192 ++++----
 po/zh_CN.po                           | 192 ++++----
 po/zh_TW.po                           | 192 ++++----
 receiver.c                            | 252 +++++++++++
 receiver.h                            | 178 ++++++++
 setup.c                               | 162 +++++++
 setup.h                               |  41 ++
 svdrpservice.h                        |   8 +-
 femonsymbol.c => symbol.c             |  16 +-
 femonsymbol.h => symbol.h             |   8 +-
 femontools.c => tools.c               | 383 ++++++++--------
 tools.h                               |  83 ++++
 femonvideo.h => video.h               |  22 +-
 53 files changed, 3418 insertions(+), 3204 deletions(-)

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