diff options
Diffstat (limited to 'libavdevice/dv1394.c')
-rw-r--r-- | libavdevice/dv1394.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index addf1ade67..c3483010fa 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -2,20 +2,20 @@ * Linux DV1394 interface * Copyright (c) 2003 Max Krasnyansky <maxk@qualcomm.com> * - * 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 */ @@ -30,7 +30,7 @@ #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" -#include "libavformat/avformat.h" +#include "avdevice.h" #include "libavformat/dv.h" #include "dv1394.h" @@ -137,7 +137,7 @@ static int dv1394_read_packet(AVFormatContext *context, AVPacket *pkt) * We have to reset :(. */ - av_log(context, AV_LOG_ERROR, "DV1394: Ring buffer overflow. Reseting ..\n"); + av_log(context, AV_LOG_ERROR, "DV1394: Ring buffer overflow. Resetting ..\n"); dv1394_reset(dv); dv1394_start(dv); @@ -173,7 +173,7 @@ restart_poll: dv->done = 0; if (s.dropped_frames) { - av_log(context, AV_LOG_ERROR, "DV1394: Frame drop detected (%d). Reseting ..\n", + av_log(context, AV_LOG_ERROR, "DV1394: Frame drop detected (%d). Resetting ..\n", s.dropped_frames); dv1394_reset(dv); @@ -186,7 +186,7 @@ restart_poll: size = avpriv_dv_produce_packet(dv->dv_demux, pkt, dv->ring + (dv->index * DV1394_PAL_FRAME_SIZE), - DV1394_PAL_FRAME_SIZE); + DV1394_PAL_FRAME_SIZE, -1); dv->index = (dv->index + 1) % DV1394_RING_FRAMES; dv->done++; dv->avail--; @@ -206,7 +206,7 @@ static int dv1394_close(AVFormatContext * context) av_log(context, AV_LOG_ERROR, "Failed to munmap DV1394 ring buffer: %s\n", strerror(errno)); close(dv->fd); - av_free(dv->dv_demux); + av_freep(&dv->dv_demux); return 0; } @@ -224,6 +224,7 @@ static const AVClass dv1394_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_dv1394_demuxer = { |