Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:22:45 +0000 (03:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:23:23 +0000 (03:23 +0200)
* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
  lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

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

Simple merge