aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
AgeCommit message (Expand)Author
2017-03-08fix merge conflictLuke Pulverenti
2017-02-273.2.5Luke Pulverenti
2017-02-25fix m2ts input specifierLuke Pulverenti
2017-02-243.2.3.1Luke Pulverenti
2017-02-23fixes #2485 - mpeg4 is still trying to be transcoded by VAAPILuke Pulverenti
2017-02-18fix mapping multiple tuner channels to same epg channelLuke Pulverenti