Browse Source

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
tags/v0.6
Diego Biurrun 15 years ago
parent
commit
d7a0e29f31
3 changed files with 25 additions and 7 deletions
  1. +1
    -1
      libavdevice/Makefile
  2. +0
    -6
      libavdevice/alldevices.c
  3. +24
    -0
      libavdevice/avdevice.c

+ 1
- 1
libavdevice/Makefile View File

@@ -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 \


+ 0
- 6
libavdevice/alldevices.c View File

@@ -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; \


+ 24
- 0
libavdevice/avdevice.c View File

@@ -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;
}

Loading…
Cancel
Save