diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-05-26 07:25:41 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-05-26 09:23:56 +0200 |
| commit | 2341c97e8d737876693fc1e0ecfe7f9f6d2b7c57 (patch) | |
| tree | 0e08b0f8c75bc7f9778e6fd845deb7f5335ff99e /libavdevice | |
| parent | c7a973e44aba0a2e59fdd8957738c32b9fae872e (diff) | |
| download | ffmpeg-2341c97e8d737876693fc1e0ecfe7f9f6d2b7c57.tar.gz | |
libdc1394: fix compilation.
Add a forgotten comma and move options/class definition outside of
HAVE_LIBDC1394_1.
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/libdc1394.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 96e9e9b88b..336c465311 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -90,6 +90,21 @@ struct dc1394_frame_rate { { 0, 0 } /* gotta be the last one */ }; +static const AVOption options[] = { +#if HAVE_LIBDC1394_1 + { "channel", "", offsetof(dc1394_data, channel), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, +#endif + { NULL }, +}; + +static const AVClass libdc1394_class = { + .class_name = "libdc1394 indev", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + + static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps) { @@ -245,20 +260,6 @@ static int dc1394_v1_close(AVFormatContext * context) return 0; } -static const AVOption options[] = { -#if HAVE_LIBDC1394_1 - { "channel", "", offsetof(dc1394_data, channel), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, -#endif - { NULL }, -}; - -static const AVClass libdc1394_class = { - .class_name = "libdc1394 indev", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - #elif HAVE_LIBDC1394_2 static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap) { @@ -378,7 +379,7 @@ AVInputFormat ff_libdc1394_demuxer = { .read_header = dc1394_v2_read_header, .read_packet = dc1394_v2_read_packet, .read_close = dc1394_v2_close, - .flags = AVFMT_NOFILE + .flags = AVFMT_NOFILE, .priv_class = &libdc1394_class, }; |