[vdr-plugin-vnsiserver] 04/05: Merge branch 'upstream'

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

commit 68b1286160da726efa0fde27ef5ea1349f5e1332
Merge: 2d89817 01052e5
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 14 13:11:03 2015 +0100

    Merge branch 'upstream'

 HISTORY                  |  50 +++-
 Makefile                 |   4 +-
 README                   |  36 ++-
 bitstream.c              |   5 +-
 bitstream.h              |   5 +-
 channelfilter.c          | 332 +++++++++++++++++++++
 channelfilter.h          |  55 ++++
 config.c                 |   7 +-
 config.h                 |   8 +-
 cxsocket.c               |   5 +-
 cxsocket.h               |   5 +-
 demuxer.c                |  57 +++-
 demuxer.h                |  12 +-
 hash.c                   |   5 +-
 hash.h                   |   5 +-
 parser.c                 |  71 ++++-
 parser.h                 |  19 +-
 parser_AAC.c             |  26 +-
 parser_AAC.h             |   3 +-
 parser_AC3.c             |   2 +-
 parser_AC3.h             |   2 +-
 parser_DTS.c             |   2 +-
 parser_DTS.h             |   2 +-
 parser_MPEGAudio.c       |  81 +++++-
 parser_MPEGAudio.h       |  11 +-
 parser_MPEGVideo.c       |  21 +-
 parser_MPEGVideo.h       |   3 +-
 parser_Subtitle.c        |   2 +-
 parser_Subtitle.h        |   2 +-
 parser_Teletext.c        |   2 +-
 parser_Teletext.h        |   2 +-
 parser_h264.c            |  22 +-
 parser_h264.h            |   2 +-
 po/de_DE.po              |  61 ++++
 po/lt_LT.po              |  61 ++++
 recordingscache.c        |  20 +-
 recordingscache.h        |  15 +-
 recplayer.c              |  28 +-
 recplayer.h              |   5 +-
 requestpacket.c          |   5 +-
 requestpacket.h          |   5 +-
 responsepacket.c         |   7 +-
 responsepacket.h         |   5 +-
 setup.c                  |  18 +-
 setup.h                  |   2 +
 status.c                 | 160 ++++++++++
 parser_DTS.c => status.h |  32 +-
 streamer.c               | 135 +++++++--
 streamer.h               |  12 +-
 videobuffer.c            |  58 +++-
 videobuffer.h            |   7 +-
 videoinput.c             |  36 ++-
 videoinput.h             |   8 +-
 vnsi.c                   |  74 ++++-
 vnsi.h                   |  27 +-
 vnsiclient.c             | 743 ++++++++++++++++++++++++++++++++++++++++++++---
 vnsiclient.h             |  33 ++-
 vnsicommand.h            |  31 +-
 vnsiserver.c             | 180 +++---------
 vnsiserver.h             |  11 +-
 60 files changed, 2222 insertions(+), 423 deletions(-)

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