Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <[email protected]>
GameFusion · Nov 17, 2014 · e60c025 · e60c025
2 parents 4dc305d + c302d03
commit e60c025
Show file tree

Hide file tree

Showing 2 changed files with 411 additions and 0 deletions.
diff --git a/libavformat/Makefile b/libavformat/Makefile
@@ -535,3 +535,4 @@ TOOLS     = aviocat                                                     \
             pktdumper                                                   \
             probetest                                                   \
             seek_print                                                  \
+            sidxindex                                                   \