[FFmpeg-cvslog] Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 10:21:07 2013 +0200| [aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a] | committer: Michael Niedermayer

Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'

* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a
---