diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:19:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:19:56 +0100 |
| commit | 3c8085dc4250a98405eb64b3765f4ceb8d177c00 (patch) | |
| tree | 69b6249cb0ee3476243f87e8b9125788cf10752a /libavfilter/af_ashowinfo.c | |
| parent | 31d8d61f590ef6ebc22607d891158fc418c796a7 (diff) | |
| parent | e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838 (diff) | |
| download | ffmpeg-3c8085dc4250a98405eb64b3765f4ceb8d177c00.tar.gz | |
Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
pthread: make ff_thread_release_buffer idempotent.
mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
0 files changed, 0 insertions, 0 deletions