Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)
commit0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4
tree1e724f0eea3edc4eb06880d8e272c2b017d209fa
parentb32643813961d7d76e9040c13d88c3a7cd6f923d
parent45dd1ae1b3c18331f3db2293a9135bc5851e553f
Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'

* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
libavfilter/buffer.c
libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/buffer.c
libavfilter/internal.h