Commit c19faa63 by Oliver Woodman

A few tiny bug fixes.

parent ec90eac3
...@@ -329,7 +329,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer { ...@@ -329,7 +329,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
super.onInputFormatChanged(holder); super.onInputFormatChanged(holder);
// TODO: Ideally this would be read in onOutputFormatChanged, but there doesn't seem // TODO: Ideally this would be read in onOutputFormatChanged, but there doesn't seem
// to be a way to pass a custom key/value pair value through to the output format. // to be a way to pass a custom key/value pair value through to the output format.
currentPixelWidthHeightRatio = holder.format.pixelWidthHeightRatio; currentPixelWidthHeightRatio = holder.format.pixelWidthHeightRatio == MediaFormat.NO_VALUE ? 1
: holder.format.pixelWidthHeightRatio;
} }
@Override @Override
......
...@@ -97,9 +97,6 @@ public class ManifestFetcher<T> extends AsyncTask<String, Void, T> { ...@@ -97,9 +97,6 @@ public class ManifestFetcher<T> extends AsyncTask<String, Void, T> {
HttpURLConnection connection = configureHttpConnection(new URL(urlString)); HttpURLConnection connection = configureHttpConnection(new URL(urlString));
inputStream = connection.getInputStream(); inputStream = connection.getInputStream();
inputEncoding = connection.getContentEncoding(); inputEncoding = connection.getContentEncoding();
if (inputEncoding == null) {
inputEncoding = C.UTF8_NAME;
}
return parser.parse(inputStream, inputEncoding, contentId, baseUri); return parser.parse(inputStream, inputEncoding, contentId, baseUri);
} finally { } finally {
if (inputStream != null) { if (inputStream != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment