Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 12:24:19 +0000 (14:24 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 13:36:54 +0000 (15:36 +0200)
commitbc3f19641ce37d14f9cfd7e2693c4833b63fba7d
treed24e3d3a5823b99a225b58a19807448c9732b352
parent8271a84094aafe142faa2305890413ddddea1110
parent6d592fbd0d8e89ecade3fc93b36ea200213dc01c
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'

* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c