* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			91 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			91 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * copyright (c) 2003 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 AVUTIL_VERSION_H
 | 
						|
#define AVUTIL_VERSION_H
 | 
						|
 | 
						|
#include "avutil.h"
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * @ingroup lavu
 | 
						|
 * Libavutil version macros
 | 
						|
 */
 | 
						|
 | 
						|
/**
 | 
						|
 * @defgroup lavu_ver Version and Build diagnostics
 | 
						|
 *
 | 
						|
 * Macros and function useful to check at compiletime and at runtime
 | 
						|
 * which version of libavutil is in use.
 | 
						|
 *
 | 
						|
 * @{
 | 
						|
 */
 | 
						|
 | 
						|
#define LIBAVUTIL_VERSION_MAJOR 51
 | 
						|
#define LIBAVUTIL_VERSION_MINOR 70
 | 
						|
#define LIBAVUTIL_VERSION_MICRO 100
 | 
						|
 | 
						|
#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
 | 
						|
                                               LIBAVUTIL_VERSION_MINOR, \
 | 
						|
                                               LIBAVUTIL_VERSION_MICRO)
 | 
						|
#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
 | 
						|
                                           LIBAVUTIL_VERSION_MINOR,     \
 | 
						|
                                           LIBAVUTIL_VERSION_MICRO)
 | 
						|
#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
 | 
						|
 | 
						|
#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
 | 
						|
 | 
						|
/**
 | 
						|
 * @}
 | 
						|
 *
 | 
						|
 * @defgroup depr_guards Deprecation guards
 | 
						|
 * 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_OLD_EVAL_NAMES
 | 
						|
#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
 | 
						|
#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_FIND_OPT
 | 
						|
#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_AV_FIFO_PEEK
 | 
						|
#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_OLD_AVOPTIONS
 | 
						|
#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM
 | 
						|
#define FF_API_OLD_TC_ADJUST_FRAMENUM   (LIBAVUTIL_VERSION_MAJOR < 52)
 | 
						|
#endif
 | 
						|
 | 
						|
/**
 | 
						|
 * @}
 | 
						|
 */
 | 
						|
 | 
						|
#endif /* AVUTIL_VERSION_H */
 | 
						|
 |