Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: patched-ffmpeg-mt/libavdevice/bktr.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * *BSD video grab interface 2 * *BSD video grab interface
3 * Copyright (c) 2002 Steve O'Hara-Smith 3 * Copyright (c) 2002 Steve O'Hara-Smith
4 * based on 4 * based on
5 * Linux video grab interface 5 * Linux video grab interface
6 * Copyright (c) 2000,2001 Gerard Lantau 6 * Copyright (c) 2000,2001 Gerard Lantau
7 * and 7 * and
8 * simple_grab.c Copyright (c) 1999 Roger Hardiman 8 * simple_grab.c Copyright (c) 1999 Roger Hardiman
9 * 9 *
10 * This file is part of FFmpeg. 10 * This file is part of FFmpeg.
11 * 11 *
12 * FFmpeg is free software; you can redistribute it and/or 12 * FFmpeg is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU Lesser General Public 13 * modify it under the terms of the GNU Lesser General Public
14 * License as published by the Free Software Foundation; either 14 * License as published by the Free Software Foundation; either
15 * version 2.1 of the License, or (at your option) any later version. 15 * version 2.1 of the License, or (at your option) any later version.
16 * 16 *
17 * FFmpeg is distributed in the hope that it will be useful, 17 * FFmpeg is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20 * Lesser General Public License for more details. 20 * Lesser General Public License for more details.
21 * 21 *
22 * You should have received a copy of the GNU Lesser General Public 22 * You should have received a copy of the GNU Lesser General Public
23 * License along with FFmpeg; if not, write to the Free Software 23 * License along with FFmpeg; if not, write to the Free Software
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 */ 25 */
26 26
27 #define _BSD_SOURCE 1 27 #define _BSD_SOURCE 1
28 #define _NETBSD_SOURCE
29
28 #include "libavformat/avformat.h" 30 #include "libavformat/avformat.h"
29 #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H 31 #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
30 # include <dev/bktr/ioctl_meteor.h> 32 # include <dev/bktr/ioctl_meteor.h>
31 # include <dev/bktr/ioctl_bt848.h> 33 # include <dev/bktr/ioctl_bt848.h>
32 #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H 34 #elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
33 # include <machine/ioctl_meteor.h> 35 # include <machine/ioctl_meteor.h>
34 # include <machine/ioctl_bt848.h> 36 # include <machine/ioctl_bt848.h>
35 #elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 37 #elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H
36 # include <dev/video/meteor/ioctl_meteor.h> 38 # include <dev/video/meteor/ioctl_meteor.h>
37 # include <dev/video/bktr/ioctl_bt848.h> 39 # include <dev/video/bktr/ioctl_bt848.h>
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 AVInputFormat bktr_demuxer = { 316 AVInputFormat bktr_demuxer = {
315 "bktr", 317 "bktr",
316 NULL_IF_CONFIG_SMALL("video grab"), 318 NULL_IF_CONFIG_SMALL("video grab"),
317 sizeof(VideoData), 319 sizeof(VideoData),
318 NULL, 320 NULL,
319 grab_read_header, 321 grab_read_header,
320 grab_read_packet, 322 grab_read_packet,
321 grab_read_close, 323 grab_read_close,
322 .flags = AVFMT_NOFILE, 324 .flags = AVFMT_NOFILE,
323 }; 325 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698