Merge commit 'c302d034'

* commit 'c302d034': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c302d034'
* commit 'c302d034': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
e60c025e · Michael Niedermayer · 4dc305d7 · c302d034 · e60c025e · e60c025e
Commit e60c025e authored Nov 17, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 411 additions and 0 deletions

Makefile libavformat/Makefile +1 -0

sidxindex.c tools/sidxindex.c +410 -0

No files found.
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -535,3 +535,4 @@ TOOLS     = aviocat                                                     \
            pktdumper                                                   \
            probetest                                                   \
            seek_print                                                  \
+            sidxindex                                                   \
--- a/tools/sidxindex.c
+++ b/tools/sidxindex.c