diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-05-25 22:34:32 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-05-25 22:34:32 +0000 |
| commit | 19720f15fd30a0f81c56989e1faf4ff6058793f3 (patch) | |
| tree | 3eb493441d59cc5bd7cf4a771836c9759e7b8478 /libav/utils.c | |
| parent | 17269bdfcdb79679f6b92024d1228e876b799a63 (diff) | |
| download | ffmpeg-19720f15fd30a0f81c56989e1faf4ff6058793f3.tar.gz | |
license/copyright change
Originally committed as revision 593 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav/utils.c')
| -rw-r--r-- | libav/utils.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/libav/utils.c b/libav/utils.c index 7bc2a5de91..1de22c05f1 100644 --- a/libav/utils.c +++ b/libav/utils.c @@ -1,20 +1,20 @@ /* * Various utilities for ffmpeg system - * Copyright (c) 2000, 2001, 2002 Gerard Lantau + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library 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 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" #include "tick.h" @@ -187,14 +187,16 @@ void register_all(void) #ifndef CONFIG_WIN32 ffm_init(); #endif -#ifdef CONFIG_GRAB +#ifdef CONFIG_VIDEO4LINUX video_grab_init(); +#endif +#ifdef CONFIG_AUDIO_OSS audio_init(); #endif /* file protocols */ register_protocol(&file_protocol); register_protocol(&pipe_protocol); -#ifndef CONFIG_WIN32 +#ifdef CONFIG_NETWORK register_protocol(&udp_protocol); register_protocol(&http_protocol); #endif |