diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 01:47:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-27 02:53:21 +0200 |
| commit | 027264cb82134c83413810810b24340f6290e11a (patch) | |
| tree | 11009209889b89443c2194dda88ef1ed7c4976ec /libavdevice/libdc1394.c | |
| parent | 701012d676042608cd6ec3317c1936a246f436d7 (diff) | |
| parent | ca7d8256e32e4dbafadc54a65b441945ac759ca9 (diff) | |
| download | ffmpeg-027264cb82134c83413810810b24340f6290e11a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
ARM: add ARMv6 optimised av_clip_uintp2
ARM: remove volatile from asm statements in libavutil/intmath
ARM: fix av_clipl_int32_arm()
v4l: include avdevice.h
ffserver: move close_connection() call to avoid a temporary string and copy.
lavf: initialize demuxer private options.
AVOptions: set string default values.
lavdevice: mark v4l for removal on next major bump.
swscale: fix compile on ppc.
swscale: fix compile on x86-32.
build: Remove generated .version file on distclean.
configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
ffplay: Remove disabled code.
Mark parameterless function declarations as 'void'.
swscale: use av_clip_uint8() in yuv2yuv1_c().
swscale: remove VOF/VOFW.
swscale: split chroma buffers into separate U/V planes.
swscale: replace formatConvBuffer[VOF] by allocated array.
rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libdc1394.c')
| -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 838f01993a..b2585ac260 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, }; |