diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-11-18 17:01:25 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-11-18 17:01:25 +0000 |
| commit | d7a0e29f3156271e4ff7c551199ba42d28e7934d (patch) | |
| tree | a27050bde7bfdda873304fb2f7722dd9db6e8326 | |
| parent | b8873c2a8f8cf1e18f8abfc20dd4e6b039e683ef (diff) | |
| download | ffmpeg-d7a0e29f3156271e4ff7c551199ba42d28e7934d.tar.gz | |
Split avdevice.c off from alldevices.c.
alldevices.c is not a good place for avdevice_version().
Originally committed as revision 20546 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 6 | ||||
| -rw-r--r-- | libavdevice/avdevice.c | 24 |
3 files changed, 25 insertions, 7 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index d26756baf9..a0c3858d83 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -5,7 +5,7 @@ FFLIBS = avformat avcodec avutil HEADERS = avdevice.h -OBJS = alldevices.o +OBJS = alldevices.o avdevice.o # input/output devices OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \ diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 1947eee88f..91c062beb4 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -20,12 +20,6 @@ #include "config.h" #include "libavformat/avformat.h" -#include "avdevice.h" - -unsigned avdevice_version(void) -{ - return LIBAVDEVICE_VERSION_INT; -} #define REGISTER_OUTDEV(X,x) { \ extern AVOutputFormat x##_muxer; \ diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c new file mode 100644 index 0000000000..ec379b9d42 --- /dev/null +++ b/libavdevice/avdevice.c @@ -0,0 +1,24 @@ +/* + * 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 + */ + +#include "avdevice.h" + +unsigned avdevice_version(void) +{ + return LIBAVDEVICE_VERSION_INT; +} |