Skip to content

Commit

Permalink
Merge branch 'master' into famesjranko-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
famesjranko authored Nov 14, 2024
2 parents f6e9747 + b46fc76 commit ff47dba
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/general/administration/hardware-selection.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ Intel is always recommended on non-apple hardware for the following reasons:
- Intel provides a good quality encoder, slightly better than Nvidia and significantly better than AMD.
- Intel drivers and the compute environment is much easier to setup than both Nvidia and AMD

AMD is not recommended because of poor quality H.264 and H.265(HEVC) output, as well as being hard to setup the compute environment. While AMD has significantly improved AV1 encoder quality. However you are still more likely to transcode to H.264 or H.265 than to AV1 due to compatibility.
AMD is not recommended because of poor quality H.264 and H.265(HEVC) output, as well as being hard to setup the compute environment. While AMD has significantly improved AV1 encoder quality, you are still more likely to transcode to H.264 or H.265 than to AV1 due to compatibility.

A list of common codecs can be found [here](/docs/general/clients/codec-support/)

The following is a list of video codecs Jellyfin supports transcoding to:

- H.264 (Most common transcode target)
- H.265 (Limited supported by clients)
- H.265 (Limited support by clients)
- AV1 (New in 10.9, supported by most modern browsers)

For decoding support, the more codecs the better. However, there are only a few codecs that media is commonly available in. The most important one to look for is HEVC 10bit decoding support, as it can be very demanding on the CPU to decode.
Expand Down
6 changes: 4 additions & 2 deletions docs/general/community-standards/servers.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ Requests for support/help with other people's servers will be ignored.

## If You Run A Jellyfin Server

If you run a Jellyfin server instance for other people, ensure that your users are aware that **you** are their contact for help and support, not us. We are not your server's "customer support" team. **You are not "Jellyfin"**. Do not use our name. Do not insinuate to your users that your server is run by us or that we are the same people.
If you run a Jellyfin server instance for other people, ensure that your users are aware that **you** are their contact for help and support, not us as a project. We are not your server's "customer support" team. **You are not "Jellyfin"**. Do not insinuate to your users that your server is run by us or that we are the same people.

We will link your users to this page if they contact us for help with your server. If you are charging people for pirate access to a Jellyfin server and violate these guidelines, and we become aware, we reserve the right to report you to your hosting provider for piracy and ban you and your users from our support channels. This is [a violation of our community standards](/docs/general/community-standards) and will not be tolerated.
The best way to avoid problems here is to use the "Branding" -> "Login disclaimer" field in the server "General" settings. In this field, give your users a help link, contact form, or something that directs them to **you**, so they know who to contact when they need help with the server.

We will link your users to this page if they contact us for help with specific issues on **your** server. If you are charging people for pirate access to a Jellyfin server and violate these guidelines, and we become aware, we reserve the right to report you to your hosting provider for piracy and ban you and your users from our support channels. This is [a violation of our community standards](/docs/general/community-standards) and will not be tolerated.

You have been warned.
2 changes: 1 addition & 1 deletion docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const config: Config = {
organizationName: 'jellyfin',
projectName: 'jellyfin.org',
themeConfig: {
image: 'images/social.png',
image: 'images/social.png?v2',
metadata: [
{ name: 'og:type', content: 'website' },
{ name: 'twitter:card', content: 'summary_large_image' },
Expand Down

0 comments on commit ff47dba

Please sign in to comment.