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)
* commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d':
  libdc1394: Fill in packet data directly

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
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;