Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:21:07 +0000 (10:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:21:16 +0000 (10:21 +0200)
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/avfiltergraph.c
libavutil/pixdesc.h

Simple merge
Simple merge