diff --git a/CHANGELOG.md b/CHANGELOG.md index c2414fbb9..fe2ec4c34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - [#1923] Wrong cyclic tag detection causing hidden sprites - Ctrl + G shortcut for tag list view - Uncompressed FLA (XFL) export creates a directory +- [#1827] Video replacing VP6 reading ### Changed - [#1913] SVG export/import of shapes - shape exact position (bounds) is retained diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/MovieImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/MovieImporter.java index b4aef0c32..8f5f3a310 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/MovieImporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/MovieImporter.java @@ -286,6 +286,7 @@ public class MovieImporter { for (FLVTAG ftag : videoTags) { videoData = ((VIDEODATA) ftag.data); if (videoData.codecId == VIDEODATA.CODEC_VP6 || videoData.codecId == VIDEODATA.CODEC_VP6_ALPHA) { + dis = new FLVInputStream(new ByteArrayInputStream(videoData.videoData)); int horizontalAdjustment = (int) dis.readUB(4); int verticalAdjustment = (int) dis.readUB(4); if (videoData.codecId == VIDEODATA.CODEC_VP6_ALPHA) { diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 2949b1d3a..3ca37a0de 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -4276,6 +4276,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se new MovieImporter().importMovie(movie, Helper.readFile(selfile.getAbsolutePath())); refreshTree(); } catch (IOException ex) { + logger.log(Level.SEVERE, "Invalid movie", ex); ViewMessages.showMessageDialog(MainPanel.this, translate("error.movie.invalid") + ": "+ex.getMessage(), translate("error"), JOptionPane.ERROR_MESSAGE); } }