diff options
Diffstat (limited to 'libavdevice/libdc1394.c')
-rw-r--r-- | libavdevice/libdc1394.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 0fa3786170..afffd89a8b 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -3,20 +3,20 @@ * Copyright (c) 2004 Roman Shaposhnik * Copyright (c) 2008 Alessandro Sappia * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -48,7 +48,7 @@ typedef struct dc1394_data { int stream_index; } dc1394_data; -struct dc1394_frame_format { +static const struct dc1394_frame_format { int width; int height; enum AVPixelFormat pix_fmt; @@ -61,7 +61,7 @@ struct dc1394_frame_format { { 0, 0, 0, 0 } /* gotta be the last one */ }; -struct dc1394_frame_rate { +static const struct dc1394_frame_rate { int frame_rate; int frame_rate_id; } dc1394_frame_rates[] = { @@ -90,16 +90,17 @@ static const AVClass libdc1394_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; static inline int dc1394_read_common(AVFormatContext *c, - struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps) + const struct dc1394_frame_format **select_fmt, const struct dc1394_frame_rate **select_fps) { dc1394_data* dc1394 = c->priv_data; AVStream* vst; - struct dc1394_frame_format *fmt; - struct dc1394_frame_rate *fps; + const struct dc1394_frame_format *fmt; + const struct dc1394_frame_rate *fps; enum AVPixelFormat pix_fmt; int width, height; AVRational framerate; @@ -168,8 +169,8 @@ static int dc1394_read_header(AVFormatContext *c) dc1394_data* dc1394 = c->priv_data; dc1394camera_list_t *list; int res, i; - struct dc1394_frame_format *fmt = NULL; - struct dc1394_frame_rate *fps = NULL; + const struct dc1394_frame_format *fmt = NULL; + const struct dc1394_frame_rate *fps = NULL; if (dc1394_read_common(c, &fmt, &fps) != 0) return -1; |