Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

Browse Source

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

Conflicts:
	libavfilter/buffersink.c

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

...

This commit is contained in:

Michael Niedermayer 2013-07-27 08:52:30 +02:00

parent 8720d3ac21 779e6c2b98

commit 2fffc05f42

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available