mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 04:26:37 +08:00 
			
		
		
		
	 039e9fe01c
			
		
	
	039e9fe01c
	
	
	
		
			
			* qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			60 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			60 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * 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 SWSCALE_VERSION_H
 | |
| #define SWSCALE_VERSION_H
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * swscale version macros
 | |
|  */
 | |
| 
 | |
| #include "libavutil/avutil.h"
 | |
| 
 | |
| #define LIBSWSCALE_VERSION_MAJOR 2
 | |
| #define LIBSWSCALE_VERSION_MINOR 1
 | |
| #define LIBSWSCALE_VERSION_MICRO 100
 | |
| 
 | |
| #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
 | |
|                                                LIBSWSCALE_VERSION_MINOR, \
 | |
|                                                LIBSWSCALE_VERSION_MICRO)
 | |
| #define LIBSWSCALE_VERSION      AV_VERSION(LIBSWSCALE_VERSION_MAJOR, \
 | |
|                                            LIBSWSCALE_VERSION_MINOR, \
 | |
|                                            LIBSWSCALE_VERSION_MICRO)
 | |
| #define LIBSWSCALE_BUILD        LIBSWSCALE_VERSION_INT
 | |
| 
 | |
| #define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
 | |
| 
 | |
| /**
 | |
|  * FF_API_* defines may be placed below to indicate public API that will be
 | |
|  * dropped at a future version bump. The defines themselves are not part of
 | |
|  * the public API and may change, break or disappear at any time.
 | |
|  */
 | |
| 
 | |
| #ifndef FF_API_SWS_GETCONTEXT
 | |
| #define FF_API_SWS_GETCONTEXT  (LIBSWSCALE_VERSION_MAJOR < 3)
 | |
| #endif
 | |
| #ifndef FF_API_SWS_CPU_CAPS
 | |
| #define FF_API_SWS_CPU_CAPS    (LIBSWSCALE_VERSION_MAJOR < 3)
 | |
| #endif
 | |
| #ifndef FF_API_SWS_FORMAT_NAME
 | |
| #define FF_API_SWS_FORMAT_NAME  (LIBSWSCALE_VERSION_MAJOR < 3)
 | |
| #endif
 | |
| 
 | |
| #endif /* SWSCALE_VERSION_H */
 |