* qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			56 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			56 lines
		
	
	
		
			1.5 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
 | 
						|
 */
 | 
						|
 | 
						|
#include "config.h"
 | 
						|
#include "avutil.h"
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * various utility functions
 | 
						|
 */
 | 
						|
 | 
						|
unsigned avutil_version(void)
 | 
						|
{
 | 
						|
    return LIBAVUTIL_VERSION_INT;
 | 
						|
}
 | 
						|
 | 
						|
const char *avutil_configuration(void)
 | 
						|
{
 | 
						|
    return FFMPEG_CONFIGURATION;
 | 
						|
}
 | 
						|
 | 
						|
const char *avutil_license(void)
 | 
						|
{
 | 
						|
#define LICENSE_PREFIX "libavutil license: "
 | 
						|
    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 | 
						|
}
 | 
						|
 | 
						|
char av_get_picture_type_char(enum AVPictureType pict_type)
 | 
						|
{
 | 
						|
    switch (pict_type) {
 | 
						|
    case AV_PICTURE_TYPE_I:  return 'I';
 | 
						|
    case AV_PICTURE_TYPE_P:  return 'P';
 | 
						|
    case AV_PICTURE_TYPE_B:  return 'B';
 | 
						|
    case AV_PICTURE_TYPE_S:  return 'S';
 | 
						|
    case AV_PICTURE_TYPE_SI: return 'i';
 | 
						|
    case AV_PICTURE_TYPE_SP: return 'p';
 | 
						|
    case AV_PICTURE_TYPE_BI: return 'b';
 | 
						|
    default:                 return '?';
 | 
						|
    }
 | 
						|
}
 |