Commit Graph

12883 Commits

Author SHA1 Message Date
Luke Pulverenti
7cbc76af27 3.2.5.4 2017-03-03 00:53:21 -05:00
Luke Pulverenti
b9c12ca4a7 update legacy stream 2017-03-02 23:36:20 -05:00
Luke Pulverenti
0a64609fb8 stub out legacy live stream 2017-03-02 16:32:20 -05:00
Luke Pulverenti
8be997b8ad update GetChannelStream 2017-03-02 16:27:46 -05:00
Luke Pulverenti
ea66ed6a71 update legacy tuner support 2017-03-02 16:24:46 -05:00
Luke Pulverenti
047d383cda add using block 2017-03-02 16:01:42 -05:00
Luke Pulverenti
495d06a970 re-use socket 2017-03-02 15:59:33 -05:00
Luke Pulverenti
fcc26d5453 fix tuner method 2017-03-02 15:56:25 -05:00
Luke Pulverenti
9776ca09db update socket interfaces 2017-03-02 15:50:09 -05:00
Luke
8e1c53aaf4 Merge pull request #2503 from MediaBrowser/dev
Dev
2017-03-02 14:06:15 -05:00
Luke Pulverenti
9f7ee6d34c 3.2.5.3 2017-03-02 14:05:59 -05:00
Luke Pulverenti
5600220580 update channel sorting 2017-03-02 14:05:43 -05:00
Luke
70cad82ce6 Merge pull request #2501 from MediaBrowser/dev
Dev
2017-03-01 15:30:51 -05:00
Luke Pulverenti
26c88e6ad6 3.2.5.2 2017-03-01 15:30:23 -05:00
Luke Pulverenti
17e42e68f6 update series definitions 2017-03-01 15:30:05 -05:00
Luke Pulverenti
cd45b0b69c update channel sorting 2017-03-01 15:29:56 -05:00
Luke Pulverenti
a181425e54 omit input container when hw encoding 2017-03-01 15:29:42 -05:00
Luke Pulverenti
5906e7f8b7 3.2.5 2017-02-27 13:47:47 -05:00
Luke Pulverenti
c63edb6e88 update recording params 2017-02-27 13:47:18 -05:00
Luke
2b54990975 Merge pull request #2496 from MediaBrowser/dev
Dev
2017-02-26 16:48:37 -05:00
Luke Pulverenti
5d094874e5 3.2.5.1 2017-02-26 16:48:21 -05:00
Luke Pulverenti
5fa3817a76 update components 2017-02-26 16:47:52 -05:00
Luke Pulverenti
bdf959cd83 fix m2ts input specifier 2017-02-25 10:59:19 -05:00
Luke Pulverenti
1cef641d17 3.2.4 2017-02-25 10:47:16 -05:00
Luke
02481aa624 Merge pull request #2491 from MediaBrowser/dev
3.2.4.1
2017-02-25 10:46:44 -05:00
Luke Pulverenti
666604e8cb 3.2.4.1 2017-02-25 10:46:18 -05:00
Luke Pulverenti
a73eeac686 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2017-02-24 15:21:37 -05:00
Luke Pulverenti
c456490de4 3.2.3 2017-02-24 15:21:30 -05:00
Luke
cd6b7f3bdc Merge pull request #2489 from MediaBrowser/beta
Beta
2017-02-24 15:21:11 -05:00
Luke Pulverenti
c07e774ca9 fix merge conflict 2017-02-24 15:21:00 -05:00
Luke Pulverenti
5d5f4162eb 3.2.3 2017-02-24 15:20:34 -05:00
Luke Pulverenti
282934bd53 fix merge conflict 2017-02-24 15:18:48 -05:00
Luke
66a844e639 Merge pull request #2488 from MediaBrowser/dev
Dev
2017-02-24 15:07:50 -05:00
Luke Pulverenti
868f0afc95 3.2.3.1 2017-02-24 15:07:26 -05:00
Luke Pulverenti
e5e73f82fa update references 2017-02-24 13:04:47 -05:00
Luke
30eb0e3bf2 update mac project 2017-02-24 13:00:18 -05:00
Luke
a905945d8b Merge pull request #2487 from MediaBrowser/dev
Dev
2017-02-24 12:19:36 -05:00
Luke Pulverenti
972ca5e449 3.2.2.1 2017-02-24 12:19:17 -05:00
Luke Pulverenti
cb5ae69fb9 fixes #2485 - mpeg4 is still trying to be transcoded by VAAPI 2017-02-23 23:23:56 -05:00
Luke
90853a3ab1 Merge pull request #2484 from MediaBrowser/dev
Dev
2017-02-23 14:14:16 -05:00
Luke Pulverenti
592c1a7f24 3.2.1.116 2017-02-23 14:13:47 -05:00
Luke Pulverenti
c33b12ba7d update m3u channel mapping 2017-02-23 14:13:26 -05:00
Luke Pulverenti
e391ee1b17 update components 2017-02-23 14:13:07 -05:00
Luke
8a8bf99550 Merge pull request #2483 from MediaBrowser/dev
Dev
2017-02-22 16:13:57 -05:00
Luke Pulverenti
34171a7507 if (string.IsNullOrWhiteSpace(result))
{
                attributes.TryGetValue("channel-id", out result);
            }
2017-02-22 16:13:27 -05:00
Luke Pulverenti
6847cac829 update recording conversion 2017-02-22 15:58:02 -05:00
Luke Pulverenti
76b456d5e8 add setting to prefer filename or embedded title 2017-02-21 17:12:32 -05:00
Luke
e298968fe5 Merge pull request #2482 from MediaBrowser/dev
Dev
2017-02-21 13:05:21 -05:00
Luke Pulverenti
389d3f7629 3.2.1.114 2017-02-21 13:04:54 -05:00
Luke Pulverenti
8d3e94ffb1 update recording conversion 2017-02-21 13:04:35 -05:00