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)
commit37984ca13334f1715d33fd490ef243aea6c97c09
tree185980e50f8124e91e52e7b68004df64c9935222
parentc099783316cf706c61e97256778fb77635f5e6e8
parent6a808f5ae17f1fcdbcfb18055872c12aef70ffff
Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

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