Merge branch 'master' of https://github.com/devttys0/binwalk

085b23fe · Craig Heffner · 54a478c1 · 5be61ad2 · 085b23fe · 085b23fe
Commit 085b23fe authored Sep 30, 2016 by Craig Heffner
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 0 deletions

animation src/binwalk/magic/animation +16 -0

filesystems src/binwalk/magic/filesystems +5 -0

No files found.
--- a/src/binwalk/magic/animation
+++ b/src/binwalk/magic/animation
+0       string  \x47\x40\x00    MPEG transport stream data
+>3	byte&0x10		!0x10		{invalid}
+>188	byte			!0x47		{invalid}
+
+0       string  \x47\xC0\x00    MPEG transport stream data
+>3	byte&0x10		!0x10		{invalid}
+>188	byte			!0x47		{invalid}
+
+0       string  \x47\x60\x00    MPEG transport stream data
+>3	byte&0x10		!0x10		{invalid}
+>188	byte			!0x47		{invalid}
+
+0       string  \x47\xE0\x00    MPEG transport stream data
+>3	byte&0x10		!0x10		{invalid}
+>188	byte			!0x47		{invalid}
+
--- a/src/binwalk/magic/filesystems
+++ b/src/binwalk/magic/filesystems
@@ -636,3 +636,8 @@
 >16     lelong   x       {strlen:%d}
 >20     string   x       first file name: "{string}"

+# QNX6 filesystem
+0       string   \xEB\x10\x90\x00    QNX6 filesystem
+
+# QNX IFS
+0       string   \xEB\x7E\xFF\x00    QNX IFS