[FFmpeg-cvslog] Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

Michael Niedermayer git at videolan.org
Sat Jul 27 08:58:49 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 27 08:52:30 2013 +0200| [2fffc05f424fea8cfcd4168e64325053dab49d0d] | committer: Michael Niedermayer

Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
	libavfilter/buffersink.c

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

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





More information about the ffmpeg-cvslog mailing list