Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

docfix

  • Loading branch information...
commit 902244370df73416b49aa16f197088f6265fd429 1 parent 8ff76e9
@chocolateboy chocolateboy authored
View
5 src/main/java/net/pms/dlna/DLNAResource.java
@@ -1336,10 +1336,9 @@ public final String toString(RendererConfiguration mediaRenderer) {
if (getPlayer() != null) { // transcoded
if (getPlayer().isTimeSeekable()) {
// PS3 doesn't like OP=11
- // FIXME if this still applies, it should be a dedicated option
+ // FIXME in the unlikely event that this still applies, it should be a dedicated option
// (feature detection rather than renderer detection) e.g.
- // DisableSeekByByte (although this conflicts with the default
- // option: 01: seek by byte only) or DisableOrgOp11 or MapOrgOp11To10
+ // DLNATranscodeMapSeekByBothToSeekByTime
if (mediaRenderer.isPS3()) {
flags = "DLNA.ORG_OP=10";
} else {
View
4 src/main/java/net/pms/encoders/MEncoderVideo.java
@@ -1750,8 +1750,8 @@ public ProcessWrapper launchTranscode(
* subtitle stuff
*/
- // handle internal subtitles
- // note: embedded and internal are mutually exclusive
+ // handle embedded subtitles
+ // note: isEmbedded() and isExternal() are mutually exclusive
if (!configuration.isMencoderDisableSubs() && (params.sid != null) && params.sid.isEmbedded()) {
cmdList.add("-sid");
cmdList.add("" + params.sid.getId());
Please sign in to comment.
Something went wrong with that request. Please try again.