Merge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 3 Nov 2016 13:53:58 +0000 (14:53 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 3 Nov 2016 13:53:58 +0000 (14:53 +0100)
commitb6422902d84ec8df6f5a64ffd8743e93307bd8e9
tree72f9c0209b0f26cf4c1b93f4238b5861005294ed
parent3932ccc472ad4f4d370dcfc1c2f574b0f3acb88c
parent722ec3eb35bc152ce91d0a4502eca0df1c0086d0
Merge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'

* commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0':
  avconv: decouple configuring filtergraphs and setting input parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c