diff --git a/wiki/tvheadend.md b/wiki/tvheadend.md index 73e604f..1d1494e 100644 --- a/wiki/tvheadend.md +++ b/wiki/tvheadend.md @@ -1,6 +1,6 @@ # TVHeadend -[TVHeadend](https://tvheadend.org/) is a server application that forwards video +[TVHeadend](https://tvheadend.org/) is a server application that forwards [video](/wiki/video.md) streams to internet streams. It supports multiple dvb tuners and tuner sticks aswell as Sat>IP tuners. It also has the ability to record programs like a digital video recorder. diff --git a/wiki/video.md b/wiki/video.md index eee38f5..72b994a 100644 --- a/wiki/video.md +++ b/wiki/video.md @@ -11,6 +11,16 @@ your needs. In general you need to consider if you want the video directly on your pc or access a server for it. +## Television + +The following is a list of programs that can be used to watch, record and/or download television +series or movies. + +- [MediathekView](https://github.com/mediathekview/mediathekview) is an open-source, cross-platform + software to view and download media from the mediathek of german, austrian and swiss television. +- [TVHeadend](/wiki/tvheadend.md) is a server-software that makes it possible to stream and record + tv shows and movies via a web interface. + ## Video Editing There are various programs that can be used to edit videos.