Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'

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

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

diff --cc libavdevice/libdc1394.c
index 60c6146,a0ea592..c5fdd10
--- 1/libavdevice/libdc1394.c
--- 2/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@@ -69,10 -69,11 +69,11 @@@ typedef struct dc1394_data 
      char *pixel_format;     /**< Set by a private option. */
      char *framerate;        /**< Set by a private option. */
  
-     AVPacket packet;
+     int size;
+     int stream_index;
  } dc1394_data;
  
 -struct dc1394_frame_format {
 +static const struct dc1394_frame_format {
      int width;
      int height;
      enum AVPixelFormat pix_fmt;