Permalink
Browse files

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

  • Loading branch information...
distler committed Aug 7, 2012
2 parents 838a116 + b4fe65e commit 4515562a90fd31ca545d26acb47777da20bed218
@@ -168,17 +168,9 @@ def magic_number_type
end
if bytes[4,4] == 'ftyp'
case bytes[8,3]
- when 'iso'
+ when 'iso', 'mp4', 'avc'
type = :mp4
- when 'mp4'
- type = :mp4
- when 'avc'
- type = :mp4
- when '3ge'
- type = :video_3gpp
- when '3gg'
- type = :video_3gpp
- when '3gp'
+ when '3ge', '3gg', '3gp'
type = :video_3gpp
when '3g2'
type = :video_3gpp2
Binary file not shown.

0 comments on commit 4515562

Please sign in to comment.