[FFmpeg-cvslog] Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'

Michael Niedermayer git at videolan.org
Sun Nov 3 12:01:38 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov  3 11:36:16 2013 +0100| [a75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b] | committer: Michael Niedermayer

Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'

* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list