diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 18:24:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 18:32:52 +0200 |
| commit | 03cbe6c8bc42626107e75b001180b81781619ed7 (patch) | |
| tree | f83ec1fa8adb21b5695c650c781b10631de8a4b5 | |
| parent | 29d854d6c5b31f816b639eac231ce86afa42b11d (diff) | |
| parent | b4ea1c5a77704eb7096bc017467b774e088ef3bd (diff) | |
| download | ffmpeg-03cbe6c8bc42626107e75b001180b81781619ed7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Not merged: Remove the ffserver test.
Remove ffserver.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffserver.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/ffserver.h b/ffserver.h deleted file mode 100644 index c76752fa43..0000000000 --- a/ffserver.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Multiple format streaming server - * copyright (c) 2002 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef FFMPEG_FFSERVER_H -#define FFMPEG_FFSERVER_H - -/* interface between ffserver and modules */ - -void ffserver_module_init(void); - -#endif /* FFMPEG_FFSERVER_H */ |