diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:33:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:33:37 +0200 |
| commit | f81a8e89a1c2819bc0b39153023188f955d3c52c (patch) | |
| tree | 84a142e85b6c60bfda5ab01fa22eeb0b9d1a93ac /libavdevice/lavfi.c | |
| parent | 7b6c0bda9e94a9214445f83a4a469110b235dbde (diff) | |
| parent | dc574658d15ad8f171dbdecbdce7197acf9424a0 (diff) | |
| download | ffmpeg-f81a8e89a1c2819bc0b39153023188f955d3c52c.tar.gz | |
Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
avconv: print filter options in -h full output.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/lavfi.c')
0 files changed, 0 insertions, 0 deletions