Commit Graph

11568 Commits

Author SHA1 Message Date
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
Luke Pulverenti
c0e5494825 respect locked fields during media probe 2017-02-21 13:04:18 -05:00
Luke
76b5d08c06 Merge pull request #2481 from MediaBrowser/dev
3.2.1.113
2017-02-20 16:22:34 -05:00
Luke Pulverenti
45250b7874 3.2.1.113 2017-02-20 16:22:15 -05:00
Luke
64b095adec Merge pull request #2480 from MediaBrowser/dev
update urls
2017-02-20 16:01:05 -05:00
Luke Pulverenti
0d39e041db update urls 2017-02-20 16:00:36 -05:00
Luke
962a0f561d Merge pull request #2479 from MediaBrowser/dev
Dev
2017-02-20 15:52:54 -05:00
Luke Pulverenti
e7ebc598c8 3.2.1.112 2017-02-20 15:52:31 -05:00
Luke Pulverenti
5d55b36487 make more classes portable 2017-02-20 15:50:58 -05:00
Luke
15df2ec3e9 Merge pull request #2478 from MediaBrowser/dev
Dev
2017-02-20 02:09:23 -05:00
Luke Pulverenti
de3ca87a76 3.2.1.111 2017-02-20 02:08:57 -05:00
Luke Pulverenti
149d16a314 preserve manual recording overrides 2017-02-20 02:04:03 -05:00
Luke
aa9605ed7b Merge pull request #2477 from MediaBrowser/dev
Dev
2017-02-18 23:18:08 -05:00
Luke Pulverenti
5d8fd7ce39 3.2.1.110 2017-02-18 23:17:50 -05:00
Luke Pulverenti
d8f48e8cdf update components 2017-02-18 23:13:54 -05:00
Luke Pulverenti
0ee1a0d7bd fix mapping multiple tuner channels to same epg channel 2017-02-18 22:46:09 -05:00