[vdr-plugin-xvdr] 02/03: Merge tag 'upstream/0.9.9+git20150304'

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

commit 7b3578b05f51c2d448b35c06737f46a312c82cf2
Merge: 436b83b cc97566
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 4 20:37:17 2015 +0100

    Merge tag 'upstream/0.9.9+git20150304'
    
    Upstream version 0.9.9+git20150304

 .gitignore                                         |   3 +
 Makefile                                           |   8 +-
 gentoo/media-plugins/vdr-plugin-xvdr/Manifest      |   1 -
 .../vdr-plugin-xvdr/vdr-plugin-xvdr-9999.ebuild    |  43 --
 gentoo/media-plugins/vdr-xvdr/ChangeLog            |  29 ++
 gentoo/media-plugins/vdr-xvdr/Manifest             |   2 +
 gentoo/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild |  65 +++
 po/.gitignore                                      |   0
 po/de_AT.po                                        |  31 ++
 po/de_DE.po                                        |  31 ++
 src/config/config.c                                |   4 +
 src/demuxer/demuxer.c                              |   1 -
 src/demuxer/demuxer.h                              |   2 +
 src/demuxer/demuxer_H264.c                         | 111 ++++--
 src/demuxer/demuxer_H264.h                         |   4 +
 src/demuxer/demuxer_LATM.c                         |   2 +-
 src/demuxer/demuxer_MPEGVideo.c                    |  33 +-
 src/demuxer/demuxer_MPEGVideo.h                    |   3 +-
 src/demuxer/parser.c                               |  12 +-
 src/demuxer/parser.h                               |   1 +
 src/demuxer/streaminfo.c                           | 110 +++---
 src/demuxer/streaminfo.h                           |  23 +-
 src/live/channelcache.c                            | 168 +++++---
 src/live/channelcache.h                            |   9 +-
 src/live/livepatfilter.c                           |  46 ++-
 src/live/livepatfilter.h                           |   4 +-
 src/live/livequeue.c                               |  26 +-
 src/live/livequeue.h                               |   9 +-
 src/live/livestreamer.c                            | 292 ++++++++++----
 src/live/livestreamer.h                            |  21 +-
 src/net/socketlock.c                               |  12 -
 src/net/socketlock.h                               |  30 --
 src/recordings/recordingscache.c                   |  59 ++-
 src/recordings/recordingscache.h                   |   6 +-
 src/recordings/recplayer.c                         | 138 ++-----
 src/recordings/recplayer.h                         |  45 ++-
 src/tools/hash.c                                   |  27 ++
 src/tools/hash.h                                   |   6 +-
 src/xvdr/timerconflicts.c                          | 120 ++++++
 src/{tools/hash.h => xvdr/timerconflicts.h}        |  19 +-
 src/xvdr/xvdrclient.c                              | 437 ++++++++++-----------
 src/xvdr/xvdrclient.h                              |  24 +-
 src/xvdr/xvdrcommand.h                             |   4 +-
 src/xvdr/xvdrserver.c                              |  45 ++-
 tools/serviceref.c                                 |   9 +-
 45 files changed, 1314 insertions(+), 761 deletions(-)

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