* qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			94 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Version macros.
 | 
						|
 *
 | 
						|
 * 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 AVFORMAT_VERSION_H
 | 
						|
#define AVFORMAT_VERSION_H
 | 
						|
 | 
						|
#include "libavutil/avutil.h"
 | 
						|
 | 
						|
#define LIBAVFORMAT_VERSION_MAJOR 53
 | 
						|
#define LIBAVFORMAT_VERSION_MINOR 12
 | 
						|
#define LIBAVFORMAT_VERSION_MICRO  0
 | 
						|
 | 
						|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
 | 
						|
                                               LIBAVFORMAT_VERSION_MINOR, \
 | 
						|
                                               LIBAVFORMAT_VERSION_MICRO)
 | 
						|
#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
 | 
						|
                                           LIBAVFORMAT_VERSION_MINOR,   \
 | 
						|
                                           LIBAVFORMAT_VERSION_MICRO)
 | 
						|
#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
 | 
						|
 | 
						|
#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 | 
						|
 | 
						|
/**
 | 
						|
 * Those FF_API_* defines are not part of public API.
 | 
						|
 * They may change, break or disappear at any time.
 | 
						|
 */
 | 
						|
#ifndef FF_API_OLD_METADATA2
 | 
						|
#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_READ_SEEK
 | 
						|
#define FF_API_READ_SEEK               (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_OLD_AVIO
 | 
						|
#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_DUMP_FORMAT
 | 
						|
#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_PARSE_DATE
 | 
						|
#define FF_API_PARSE_DATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_FIND_INFO_TAG
 | 
						|
#define FF_API_FIND_INFO_TAG           (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_PKT_DUMP
 | 
						|
#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_GUESS_IMG2_CODEC
 | 
						|
#define FF_API_GUESS_IMG2_CODEC        (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_SDP_CREATE
 | 
						|
#define FF_API_SDP_CREATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
 | 
						|
#define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_FORMAT_PARAMETERS
 | 
						|
#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_FLAG_RTP_HINT
 | 
						|
#define FF_API_FLAG_RTP_HINT           (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_AVSTREAM_QUALITY
 | 
						|
#define FF_API_AVSTREAM_QUALITY        (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_LOOP_INPUT
 | 
						|
#define FF_API_LOOP_INPUT              (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_LOOP_OUTPUT
 | 
						|
#define FF_API_LOOP_OUTPUT             (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
#ifndef FF_API_TIMESTAMP
 | 
						|
#define FF_API_TIMESTAMP               (LIBAVFORMAT_VERSION_MAJOR < 54)
 | 
						|
#endif
 | 
						|
 | 
						|
#endif /* AVFORMAT_VERSION_H */
 |