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)
* 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>
1  2 
libavfilter/avfiltergraph.c

Simple merge