diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-11 02:03:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-11 02:03:47 +0100 |
| commit | 7ee5f764ee6cbdff67e04f7959acedff80fcd59b (patch) | |
| tree | c07fd8a0fe99577444e451e71a7005d4c1201b3b /doc/fftools-common-opts.texi | |
| parent | 66daf3b81154078852a049b44fc477d5195cd0f5 (diff) | |
| parent | e737a4aaafcb1d761b7f96043c2f83ce742c64ae (diff) | |
| download | ffmpeg-7ee5f764ee6cbdff67e04f7959acedff80fcd59b.tar.gz | |
Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
dashenc: Change the duration fields to 64 bit
Conflicts:
libavformat/dashenc.c
See: e65849a70bfb401306038d41ebd8b5750deb3cfd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/fftools-common-opts.texi')
0 files changed, 0 insertions, 0 deletions