Fixed #1827 Video replacing VP6 reading

This commit is contained in:
Jindra Petřík
2022-12-29 12:46:40 +01:00
parent 7d548fca30
commit 32807b826d
3 changed files with 3 additions and 0 deletions

View File

@@ -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

View File

@@ -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) {

View File

@@ -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);
}
}