diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:33:57 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:33:57 -0700 |
| commit | 9aa3023672b3336968cbdb5c4a733b6088ad564e (patch) | |
| tree | 1eca1cafedc738c61b7de481c405af44feeab9fd /ffmpeg_opt.c | |
| parent | 7f7cedd7139f18480e3dacd1abcfd94bda01fa17 (diff) | |
| parent | 49670e4218d34899a1c37abb7a11615efc16f757 (diff) | |
| download | ffmpeg-9aa3023672b3336968cbdb5c4a733b6088ad564e.tar.gz | |
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
* commit '49670e4218d34899a1c37abb7a11615efc16f757':
avconv: add a function for determining whether a filtergraph is simple
Conflicts:
avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions