commit 88bd0c6cfa7fcfbbebcc15c2c565f714cb36b065
author Ian Rogers <irogers@google.com> Wed Mar 16 18:55:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 16 18:55:36 2016 +0000
tree a84f032ffc32e6f85502e2c2d62658793c104e42
parent 37d85ea1f71bf0bfdea15dd5bfa8785ece1a15d2
parent 967c1f29abc321c34306424534c8b57a033b18dc

Merge "Fix assignment of H264TrackImpl.timescale."
am: 967c1f2

* commit '967c1f29abc321c34306424534c8b57a033b18dc':
  Fix assignment of H264TrackImpl.timescale.

isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java

diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java
index b3c1866..db4b8a2 100644
--- a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java
+++ b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java
@@ -55,10 +55,10 @@
     private boolean determineFrameRate = true;
     private String lang = "und";
 
-    public H264TrackImpl(InputStream inputStream, String lang, long timescale) throws IOException {
+    public H264TrackImpl(InputStream inputStream, String lang, int timescale) throws IOException {
         this.lang = lang;
         if (timescale > 1000) {
-            timescale = timescale; //e.g. 23976
+            this.timescale = timescale; //e.g. 23976
             frametick = 1000;
             determineFrameRate = false;
         } else {