Compare commits

..

5 Commits
15 ... 18

Author SHA1 Message Date
sparklyballs
4c754e3fa7 fix broken markdown 2016-09-11 21:56:55 +01:00
sparklyballs
f04613e139 quick and dirty edit to readme
broken link in markdown
2016-09-10 13:20:36 +01:00
sparklyballs
9fb879c301 Merge pull request #26 from linuxserver/microbadger
Microbadger
2016-09-10 11:25:28 +01:00
sparklyballs
8600fdc8ef add layer badge to README 2016-09-10 10:57:29 +01:00
sparklyballs
a015422c01 add layer badge to README 2016-09-10 10:55:40 +01:00

View File

@@ -11,7 +11,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
# linuxserver/tvheadend
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
[![](https://images.microbadger.com/badges/image/linuxserver/tvheadend.svg)](http://microbadger.com/images/linuxserver/tvheadend "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
[Tvheadend](https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
@@ -44,6 +44,9 @@ Add one of the tags, if required, to the linuxserver/tvheadend line of the run/c
+ **stable-4.0.9** : latest stable version.
#### Host vs. Bridge
If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.
**Parameters**
@@ -102,7 +105,7 @@ Go to Configuration --> Recording. Change the view level to advanced in the top
comskip --ini=/config/comskip/comskip.ini "%f"
```
Now comskip will run after each recording is finished. You will find comskip.ini in the comskip folder of your /config volume mapping. See the [Comskip] (http://www.kaashoek.com/comskip/) homepage for tuning of the ini file.
Now comskip will run after each recording is finished. You will find comskip.ini in the comskip folder of your /config volume mapping. See the [Comskip](http://www.kaashoek.com/comskip/) homepage for tuning of the ini file.
**FFmpeg**
@@ -114,7 +117,7 @@ FFmpeg is installed in /usr/bin/ in case you need to use it with pipe.
If you have EPG data in XML format from a supplier, you can drop it in the data folder of your your /config volume mapping. Then choose the XML file grabber in Configuration --> Channel/EPG --> EPG Grabber Modules.
If you use WebGrab+Plus, choose the WebGrab+Plus XML file grabber. The XML file goes in the same path as above.
For advanced setup of tvheadend, go to [tvheadend.org] (https://www.tvheadend.org)
For advanced setup of tvheadend, go to [Tvheadend][tvheadendurl]
## Info
@@ -123,4 +126,5 @@ For advanced setup of tvheadend, go to [tvheadend.org] (https://www.tvheadend.or
## Versions
+ **10.09.2016:** Add layer badges to README.
+ **05.09.2016:** Initial release.