[FFmpeg-cvslog] Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'

Michael Niedermayer git at videolan.org
Sun Nov 3 12:34:31 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov  3 12:23:01 2013 +0100| [7edc9240a8f424fdcb30efeed127ffca8145774a] | committer: Michael Niedermayer

Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'

* commit '3a14b160bd442794c6a16a6a883adb547550e847':
  vf_scale: make the dar variable return the DAR.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/version.h

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

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





More information about the ffmpeg-cvslog mailing list