1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00

Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'

* commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c':
  tools: Add a sidxindex tool

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-17 23:09:22 +01:00
2 changed files with 411 additions and 0 deletions

View File

@@ -535,3 +535,4 @@ TOOLS = aviocat \
pktdumper \
probetest \
seek_print \
sidxindex \