ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun
Jul 19 14:24:19 2015 +0200| [bc3f19641ce37d14f9cfd7e2693c4833b63fba7d] |
committer: Michael Niedermayer
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc3f19641ce37d14f9cfd7e2693c4833b63fba7d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
