[FFmpeg-cvslog] Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'

Michael Niedermayer git at videolan.org
Sun Jul 19 15:44:55 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | 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 <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc3f19641ce37d14f9cfd7e2693c4833b63fba7d
---





More information about the ffmpeg-cvslog mailing list