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
This commit is contained in:
		
							parent
							
								
									b8873c2a8f
								
							
						
					
					
						commit
						d7a0e29f31
					
				@ -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 \
 | 
			
		||||
 | 
			
		||||
@ -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
									
								
								libavdevice/avdevice.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								libavdevice/avdevice.c
									
									
									
									
									
										Normal 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…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user