Commit Graph

10663 Commits

Author SHA1 Message Date
Luke Pulverenti
8f22159186 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-03-08 14:05:40 -05:00
Luke Pulverenti
0747752ef6 update library monitor logging 2017-03-08 14:05:33 -05:00
Luke Pulverenti
d5c7845917 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2017-03-08 02:24:52 -05:00
Luke Pulverenti
cf57e8193c 3.2.6 2017-03-08 02:24:46 -05:00
Luke
23010f2980 Merge pull request #2516 from MediaBrowser/beta
Beta
2017-03-08 02:24:30 -05:00
Luke Pulverenti
0ac0a09c80 fix merge conflict 2017-03-08 02:24:17 -05:00
Luke
314b84ae9e Merge pull request #2517 from MediaBrowser/dev
update mac project
2017-03-08 02:23:30 -05:00
Luke
c64694f7c6 update mac project 2017-03-08 02:22:49 -05:00
Luke Pulverenti
49fd5551ba fix merge conflict 2017-03-08 02:06:18 -05:00
Luke
81467ebb34 Merge pull request #2515 from MediaBrowser/dev
Dev
2017-03-08 02:02:22 -05:00
Luke Pulverenti
9383378e81 fix playaccess property 2017-03-08 02:01:53 -05:00
Luke Pulverenti
7b46768958 fix chapter images being stretched 2017-03-08 01:48:07 -05:00
Luke Pulverenti
1f63a30ee7 update mjpeg stream detection 2017-03-07 14:05:44 -05:00
Luke
82bb69213e Merge pull request #2514 from MediaBrowser/dev
update legacy hd homerun support
2017-03-07 13:28:23 -05:00
Luke Pulverenti
9fa6868af3 update legacy hd homerun support 2017-03-07 13:27:56 -05:00
Luke
972aaba66e Merge pull request #2512 from MediaBrowser/dev
update legacy hdhomerun support
2017-03-05 21:33:18 -05:00
Luke Pulverenti
9e74d834a7 update legacy hdhomerun support 2017-03-05 21:32:56 -05:00
Luke
881d442058 Merge pull request #2511 from MediaBrowser/dev
Dev
2017-03-05 10:39:12 -05:00
Luke Pulverenti
00fb471162 3.2.5.6 2017-03-05 10:38:54 -05:00
Luke Pulverenti
ce3f2bdd20 reduce AnalyzeDurationMs for live tv 2017-03-05 10:38:36 -05:00
Luke Pulverenti
8b77a89373 change people to prefer folder.jpg 2017-03-05 10:38:17 -05:00
gerrit507
a74373e851 Remove level param for nvenc, because it fails to encode with it. 2017-03-05 13:51:44 +01:00
gerrit507
46b6235b8a Revert "Fix naming of nvenc codecs. It should be nvenc_h264."
This reverts commit 44ae8c94fc720fc14d4fc551cd375006691d3d3e.
2017-03-05 13:25:36 +01:00
gerrit507
c1208a2f8d Fix naming of nvenc codecs. It should be nvenc_h264. 2017-03-05 04:02:03 +01:00
Luke
c6aaebc232 Merge pull request #2507 from gerrit507/dev
Add hevc hw-decoders and encoders to var required
2017-03-04 14:31:14 -05:00
gerrit507
c70dfc713b Add hevc hw-decoders and encodrs to var required.
These hardware decoders should be added for letting emby recognize this hw-decoders and encoders. This in addition to  #2506 and on the dev branch as wished.
2017-03-04 11:51:06 +01:00
Luke Pulverenti
c811d57bca remove hardcoded address families 2017-03-03 15:16:43 -05:00
Luke
50ecda3d18 Merge pull request #2505 from MediaBrowser/dev
3.2.5.5
2017-03-03 01:38:28 -05:00
Luke Pulverenti
d68cdc0c6d 3.2.5.5 2017-03-03 01:38:05 -05:00
Luke
9f8cbc668d Merge pull request #2504 from MediaBrowser/dev
Dev
2017-03-03 00:53:47 -05:00
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