diff options
| author | Ian Rogers <irogers@google.com> | 2016-03-16 17:29:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-16 17:29:15 +0000 |
| commit | 967c1f29abc321c34306424534c8b57a033b18dc (patch) | |
| tree | 553a4df0e0de80b98663bbd2ddcec69af638a628 | |
| parent | ea43bba0f3ac3650ae3a36f632b86e346a4afce9 (diff) | |
| parent | 54962c7504fac8ca8e7240d384cc3d0ad7e9fb9a (diff) | |
| download | mp4parser-967c1f29abc321c34306424534c8b57a033b18dc.tar.gz | |
Merge "Fix assignment of H264TrackImpl.timescale."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | isoparser/src/main/java/com/googlecode/mp4parser/authoring/tracks/H264TrackImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class H264TrackImpl extends AbstractTrack { 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 { |