OSDN Git Service

Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:27:47 +0000 (16:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:28:27 +0000 (16:28 +0100)
commitb64077bebe1f29adb2e72af1d9382c35f73ae651
tree75c6d89b265b4fec8d9b3c121cdcc1f7b9dd91e0
parente1b1092755ba77b93a2f9b742d2fd92f69b746af
parent9676b9a2cdc4a90611188fc48d8d388e427997c5
Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'

* commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
  AVOption: remove an unused function parameter.
  filters.texi: restore mistakenly removed section name for noformat
  avfiltergraph: use sizeof(var) instead of sizeof(type)

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