Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:33:57 +0000 (20:33 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:33:57 +0000 (20:33 -0700)
commit9aa3023672b3336968cbdb5c4a733b6088ad564e
tree1eca1cafedc738c61b7de481c405af44feeab9fd
parent7f7cedd7139f18480e3dacd1abcfd94bda01fa17
parent49670e4218d34899a1c37abb7a11615efc16f757
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>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c