Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Dec 2013 21:07:24 +0000 (22:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Dec 2013 21:07:24 +0000 (22:07 +0100)
commita788949255d5fde243575b556e2950feafdc6755
tree1208497991bf2761a625db4e98f2b65f53e214bc
parent792845e436ddc5f3ce11ba02535a3372919061f2
parent6d3ea1957f681b3bf9c752e6d21a501cc8d4180d
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavfilter/version.h