Skip to content
Browse files

nitfixen

  • Loading branch information...
1 parent d0a8a65 commit 61cb29fe5e09aff81d663a2c8ba295f054ae2116 @chocolateboy chocolateboy committed Apr 8, 2012
View
2 src/main/external-resources/renderers/PS3.conf
@@ -223,7 +223,7 @@ StreamExtensions =
# ForceJPGThumbnails: Some renderers require thumbnails to be represented as
# JPEGs (JPEG_TN) in the DLNA directory XML (e.g. Sony Bravia TVs and Blu-ray
# players). Set this to true to force PMS to use this representation. Note:
-# this has no effect on thumbnail content-type headers or file formats.
+# this has no effect on thumbnail file formats or content-type headers.
ForceJPGThumbnails = false
# ChunkedTransfer: Some renderers are particular about the "Content-Length"
View
4 src/main/java/net/pms/encoders/MEncoderVideo.java
@@ -1123,7 +1123,7 @@ public boolean isTimeSeekable() {
if (overriddenMainArgs != null) {
// add the sanitized custom MEncoder options.
// not cached because they may be changed on the fly in the GUI
- // XXX if/when we upgrade to org.apache.commons.lang3:
+ // TODO if/when we upgrade to org.apache.commons.lang3:
// args = ArrayUtils.addAll(defaultArgs, sanitizeArgs(overriddenMainArgs))
String[] sanitizedCustomArgs = sanitizeArgs(overriddenMainArgs);
args = new String[defaultArgs.length + sanitizedCustomArgs.length];
@@ -1558,7 +1558,7 @@ public ProcessWrapper launchTranscode(
// set subtitles font
if (configuration.getMencoderFont() != null && configuration.getMencoderFont().length() > 0) {
- // set font with -font option, workarond for
+ // set font with -font option, workaround for
// https://github.com/Happy-Neko/ps3mediaserver/commit/52e62203ea12c40628de1869882994ce1065446a#commitcomment-990156 bug
sb.append(" -font ").append(configuration.getMencoderFont()).append(" ");
sb.append(" -ass-force-style FontName=").append(configuration.getMencoderFont()).append(",");

0 comments on commit 61cb29f

Please sign in to comment.
Something went wrong with that request. Please try again.