michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,187 Commits 2 Branches 79 Tags 73 MiB
ed69e690b8
Commit Graph

13187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PloughPuff
ed69e690b8 Review comments 
Address review comments from JustAMan, Bond-009 and cvium.
 2019-03-05 21:29:15 +00:00
PloughPuff
20775116f7 Reworked FFmpeg path discovery and always display to user 
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger).  Removed FFMpeg folder from Emby.Server.Implementations.  All path discovery now in MediaEncoder.

2) Always display FFmpeg path to user in Transcode page.

3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available).

4) Remove unused code associated with 'prebuilt' FFmpeg.

5) Much improved logging during path discovery.
 2019-03-05 21:24:54 +00:00
Joshua M. Boniface
5587dd8bfb
Merge pull request #900 from ploughpuff/validator 
Implement proper FFmpeg version checking
 2019-03-05 11:07:49 -05:00
Bond-009
8d1fc3f984
Merge pull request #1043 from thornbill/update-colors 
Update image overlays to use Jellyfin blue
 2019-03-05 12:06:48 +01:00
Bill Thornton
41df94115f Update image overlays to use Jellyfin blue 2019-03-04 22:36:23 -05:00
Joshua M. Boniface
aba22b92bc
Merge pull request #735 from Bond-009/loop 
Readability changes
 2019-03-04 00:27:48 -05:00
Daniel Widrick
5982cdad90 Implement SxxExx EpisodeNum Processing (#1009) 
**Changes**
Implement and use SxxExx Episode numbering system from guide data if available.

**Issues**
Fixes #1008
 2019-03-03 12:46:03 +01:00
Bond-009
c328417d29
Merge pull request #1030 from jellyfin/release-10.2.z 
Backmerge for 10.2.2
 2019-03-02 18:12:24 +01:00
Bond-009
c4192f9f8b
Merge pull request #1032 from Lynxy/master 
Correct the list of series types
 2019-03-02 18:11:53 +01:00
Lynxy
5368112d90 Correct the list of series types 2019-03-01 22:28:25 -05:00
Bond-009
9993dafe54 Don't mix LINQ and roreach loops for readability 2019-03-01 17:12:22 +01:00
Andrew Rabert
65403747df
Merge pull request #1025 from jellyfin/justadep 
Treat jellyfin-web as just another dependency for Docker builds
 2019-03-01 07:52:29 -05:00
Bond-009
594b271383
Merge pull request #1024 from jellyfin/release-10.2.z 
Backmerge for 10.2.2
 2019-03-01 07:49:07 +01:00
Andrew Rabert
27f9981142 Treat jellyfin-web as just another dependency for Docker builds 2019-03-01 00:17:46 -05:00
Joshua Boniface
58e5931a32 Bump version to 10.2.2 2019-02-28 22:03:08 -05:00
Bond-009
02041fa6f4
Merge pull request #1020 from Lynxy/master 
Do not allow new users to delete content by default
 2019-02-28 21:17:11 +01:00
Anthony Lavado
fcd299965d
Merge pull request #992 from joshuaboniface/armhf-debian 
Add Debian armhf (Rasberry Pi) build plus crossbuild
 2019-02-28 12:55:59 -05:00
Vasily
79d5a53aea
Merge pull request #1018 from fasheng/fix-dlna-rmvb 
Fix rmvb video can not play under DLNA
 2019-02-28 19:41:53 +03:00
Vasily
f1086a72bf
Improve logic when determining return value 
Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com>
 2019-02-28 15:58:41 +00:00
Xu Fasheng
95d001a053 Update CONTRIBUTORS.md 2019-02-28 22:15:59 +08:00
Vasily
b7fd68d366
Merge pull request #1017 from nvllsvm/dockerffmpeg 
Set ffmpeg+ffprobe paths in Docker container
 2019-02-28 16:43:35 +03:00
The Lynxy
c84729a4f4
Do not allow new users to delete content by default 2019-02-28 07:50:32 -05:00
Xu Fasheng
4951ec9814 Fix rmvb video can not play under DLNA 
Or will report "Could not find handler for /videos/xxx/stream.rm" error
in server side.

Test OK with Kodi and gupnp-tools.
 2019-02-28 18:00:25 +08:00
Andrew Rabert
1d1e6dede9 Set ffmpeg+ffprobe paths in Docker container 
Will always ensure containers use correct path.

Yes - the arm images have a different path than the amd64 one. This is
caused by the amd64 image using ffmpeg from jellyfin/ffmpeg while the
others use ffmpeg from their distro's repos.
 2019-02-27 21:04:37 -05:00
Andrew Rabert
f384822aa5
Merge pull request #991 from joshuaboniface/ffmpeg-compat 
Fix the ffmpeg compatibility
 2019-02-27 20:45:43 -05:00
PloughPuff
7668ecf9c9 Use Version Class to ease comparisons 2019-02-27 18:20:48 +00:00
Vasily
3769453541
Merge pull request #978 from fasheng/fix-dlna-multiple-interfaces 
Fix DLNA for multiple interfaces on linux
 2019-02-27 19:23:31 +03:00
Vasily
8c2af50170
Merge pull request #1011 from Bond-009/order 
Don't try to order the response the same as the request
 2019-02-27 17:29:12 +03:00
Xu Fasheng
7429c07c05 Remove redundant parenthesis 2019-02-27 20:16:54 +08:00
Joshua M. Boniface
9651a78b0c
Merge pull request #977 from Lynxy/genpts 
Always set ffmpeg flag +genpts when video stream is being copied
 2019-02-27 00:52:51 -05:00
Joshua M. Boniface
9eba31185a
Merge pull request #959 from Bond-009/string 
Reduce string allocations at startup
 2019-02-27 00:37:31 -05:00
Joshua M. Boniface
aea7edf0fa
Merge pull request #891 from Bond-009/postsan 
Reduce the amount of db calls during the post scan event
 2019-02-27 00:31:48 -05:00
Joshua M. Boniface
42d4834f63
Merge pull request #849 from Bond-009/span 
Less string allocations
 2019-02-27 00:30:31 -05:00
Joshua M. Boniface
ba78f6a0ff
Merge pull request #999 from cvium/dont_write_disposed_log 
Check that ffmpeg log target isn't disposed before writing to it
 2019-02-27 00:27:25 -05:00
Joshua M. Boniface
968e282c90
Merge pull request #1007 from Bond-009/time 
Log time in a standardized way
 2019-02-26 16:05:59 -05:00
Bond-009
1731bf7372 Remove ordering items 2019-02-26 20:47:23 +01:00
Bond-009
0804bed66d Log time in a standardized way 2019-02-26 19:40:23 +01:00
Bond-009
a0606b5730 Don't change submodule 2019-02-26 17:11:27 +01:00
Bond-009
9ba6227db4 Less string allocations 2019-02-26 17:11:04 +01:00
Vasily
9bab93262e
Merge pull request #1003 from Bond-009/stopwatch 
Use stopwatch for more accurate measurements and reduce log spam
 2019-02-26 01:27:42 +03:00
Bond_009
0f9006c81f Use stopwatch for more accurate measurements and reduce log spam 
DateTime.Now is suitible for small timespans
Replaced the needlessly complex and verbose logging for the httpserver
 2019-02-25 18:26:17 +01:00
Vasily
b3438559cc
Merge pull request #1000 from cvium/fix_object_disposed 
Don't close the socket response multiple times
 2019-02-25 16:52:31 +03:00
Vasily
8e5cccb22c
Merge pull request #998 from cvium/enableraisingevents_default_true 
Set EnableRaisingEvents to true for processes that require it
 2019-02-25 16:42:27 +03:00
Vasily
500c0b9cba
Merge pull request #979 from Wuerfelbecher/release-disable-debug 
Build Package releases without debug turned on
 2019-02-25 16:35:06 +03:00
Joshua Boniface
5054a77dcf Fix the ffmpeg compatibility 
Doing this the other way was just complex. No longer try to override
the system ffmpeg, just put ours somewhere else and depend on that
package.
 2019-02-25 00:41:34 -05:00
Joshua Boniface
dac2c98d8a Disable documentation and debug in build 2019-02-24 23:20:04 -05:00
Claus Vium
4df3333b71 Remove the unused status code 2019-02-24 22:31:46 +01:00
Claus Vium
5262e50fee Try another fix 2019-02-24 22:28:46 +01:00
Claus Vium
547d0ecf58 Move the check further down 2019-02-24 22:04:30 +01:00
Claus Vium
6e07eab247 Don't close the socket response multiple times 2019-02-24 21:45:03 +01:00