← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavdevice/libdc1394.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavdevice/libdc1394.c
23
23
#include "config.h"
24
24
#include "libavformat/avformat.h"
25
25
 
26
 
#if ENABLE_LIBDC1394_2
 
26
#if HAVE_LIBDC1394_2
27
27
#include <dc1394/dc1394.h>
28
 
#elif ENABLE_LIBDC1394_1
 
28
#elif HAVE_LIBDC1394_1
29
29
#include <libraw1394/raw1394.h>
30
30
#include <libdc1394/dc1394_control.h>
31
31
 
45
45
#undef free
46
46
 
47
47
typedef struct dc1394_data {
48
 
#if ENABLE_LIBDC1394_1
 
48
#if HAVE_LIBDC1394_1
49
49
    raw1394handle_t handle;
50
50
    dc1394_cameracapture camera;
51
 
#elif ENABLE_LIBDC1394_2
 
51
#elif HAVE_LIBDC1394_2
52
52
    dc1394_t *d;
53
53
    dc1394camera_t *camera;
54
54
    dc1394video_frame_t *frame;
142
142
    return -1;
143
143
}
144
144
 
145
 
#if ENABLE_LIBDC1394_1
 
145
#if HAVE_LIBDC1394_1
146
146
static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
147
147
{
148
148
    dc1394_data* dc1394 = c->priv_data;
236
236
    return 0;
237
237
}
238
238
 
239
 
#elif ENABLE_LIBDC1394_2
 
239
#elif HAVE_LIBDC1394_2
240
240
static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap)
241
241
{
242
242
    dc1394_data* dc1394 = c->priv_data;
359
359
};
360
360
 
361
361
#endif
362
 
#if ENABLE_LIBDC1394_1
 
362
#if HAVE_LIBDC1394_1
363
363
AVInputFormat libdc1394_demuxer = {
364
364
    .name           = "libdc1394",
365
365
    .long_name      = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),