Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 19:29:12 +0000 (20:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 19:29:29 +0000 (20:29 +0100)
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

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

Simple merge