Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:53:03 +0000 (20:53 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:53:03 +0000 (20:53 -0700)
commit1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab
tree1219a7d01b489d4701bd06be9459c7725a208378
parent9aa3023672b3336968cbdb5c4a733b6088ad564e
parent73c6ec6d659bab11ac424a4ba6ce3a56246295ee
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge

* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
  avconv: create simple filtergraphs earlier

Merged-by: Timothy Gu <timothygu99@gmail.com>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c