mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 13:10:45 +02:00
Merge pull request #7925 from nyanmisaka/remove-mpeg4-amf
(cherry picked from commit b295b0478c
)
Signed-off-by: crobibero <cody@robibe.ro>
This commit is contained in:
parent
db8047136d
commit
9c5d30c217
|
@ -4686,11 +4686,6 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
return GetHwaccelType(state, options, "vc1", bitDepth, hwSurface);
|
return GetHwaccelType(state, options, "vc1", bitDepth, hwSurface);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.Equals("mpeg4", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return GetHwaccelType(state, options, "mpeg4", bitDepth, hwSurface);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is8_10bitSwFormatsAmf)
|
if (is8_10bitSwFormatsAmf)
|
||||||
|
|
Loading…
Reference in a new issue