Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:27:46 +0000 (17:27 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:27:46 +0000 (17:27 +0100)
commitb9292a9698375510c5668cde4ce80dea79d8ec02
tree432f988db2b09d26bc017e63a24ae130e35a4e33
parentfa02765886294b07a1553570d5c9b5757a78e7f0
parent5d0f85f1b2469b60d0838330aabe5353fdd9ef1d
Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'

* commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d':
  libdc1394: Fill in packet data directly

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavdevice/libdc1394.c