diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 21:04:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 21:04:31 +0200 |
| commit | 1c0c19f8bd4b3469ce054a0a78bc1edba0e30689 (patch) | |
| tree | 34760cd51f5ab434683f054a82f2eb33ba1984d0 /doc/multithreading.txt | |
| parent | 1ace9573dce509e2b25165199c3b658667860ecf (diff) | |
| parent | 884f7c975f0af25febe86660e87bf3b2165a0309 (diff) | |
| download | ffmpeg-1c0c19f8bd4b3469ce054a0a78bc1edba0e30689.tar.gz | |
Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
output example: set the stream timebase
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/multithreading.txt')
0 files changed, 0 insertions, 0 deletions