From: Michael Zucchi Date: Wed, 16 Oct 2019 22:14:34 +0000 (+1030) Subject: Fix netbeans fucking around X-Git-Url: https://code.zedzone.au/cvs?a=commitdiff_plain;h=528ea15c4cc55e241ad39618255e1e58d3528bd9;p=jjmpeg Fix netbeans fucking around --- diff --git a/src/notzed.jjmpeg/classes/au/notzed/jjmpeg/io/JJMediaReader.java b/src/notzed.jjmpeg/classes/au/notzed/jjmpeg/io/JJMediaReader.java index dbb047a..9892eaf 100644 --- a/src/notzed.jjmpeg/classes/au/notzed/jjmpeg/io/JJMediaReader.java +++ b/src/notzed.jjmpeg/classes/au/notzed/jjmpeg/io/JJMediaReader.java @@ -97,7 +97,6 @@ public class JJMediaReader implements AutoCloseable { switch (cp.getCodecType()) { case AVMediaType.AVMEDIA_TYPE_VIDEO: streams[i] = new JJReaderVideo(s, cp); - s.setDiscard(AVDiscardBits.AVDISCARD_NONE); break; case AVMediaType.AVMEDIA_TYPE_AUDIO: streams[i] = new JJReaderAudio(s, cp); @@ -259,7 +258,7 @@ public class JJMediaReader implements AutoCloseable { * * @return */ - public JJReaderStream readFrameOLD() throws AVIOException { + public JJReaderStream readFrame() throws AVIOException { if (freePacket) { packet.clear(); @@ -301,7 +300,7 @@ public class JJMediaReader implements AutoCloseable { JJReaderStream last; - public JJReaderStream readFrame() throws AVIOException { + public JJReaderStream readFrameX() throws AVIOException { if (freePacket) { packet.clear(); }