diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:17:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:17:46 +0200 |
| commit | bf0547504b733b22f0498e84721b3bc712dce451 (patch) | |
| tree | 0fea123019a63f287c79d71cbc48b666a3faf3b1 /COPYING.GPLv3 | |
| parent | 42f5fc716e932b7b015d6605f2d88fc0eea4488b (diff) | |
| parent | bce70f8170592599a4f2f5f02606c1246e88df57 (diff) | |
| download | ffmpeg-bf0547504b733b22f0498e84721b3bc712dce451.tar.gz | |
Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'
* commit 'bce70f8170592599a4f2f5f02606c1246e88df57':
configure: make avconv select (a)trim filters
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions