diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-30 02:45:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-30 02:45:36 +0100 |
| commit | be787bccc00c0da482e99315dd7b155c575aa159 (patch) | |
| tree | e248e255ee58a04119cb8d4b190697d8388bd75b /tools/crypto_bench.c | |
| parent | ad600e10da6beaa057ae16fdb12c94414dd6c20e (diff) | |
| parent | a9911a1b2df37ca808e06dc30627215f4ec9a9e4 (diff) | |
| download | ffmpeg-be787bccc00c0da482e99315dd7b155c575aa159.tar.gz | |
Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'
* commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4':
doc: Document the omit_tfhd_offset flag to the mp4 muxer
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/crypto_bench.c')
0 files changed, 0 insertions, 0 deletions