* commit '096696ef':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>