* qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			59 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Simple IDCT
 | |
|  *
 | |
|  * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at>
 | |
|  *
 | |
|  * 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
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * simple idct header.
 | |
|  */
 | |
| 
 | |
| #ifndef AVCODEC_SIMPLE_IDCT_H
 | |
| #define AVCODEC_SIMPLE_IDCT_H
 | |
| 
 | |
| #include <stdint.h>
 | |
| #include "dsputil.h"
 | |
| 
 | |
| void ff_simple_idct_put_8(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct_add_8(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct_8(DCTELEM *block);
 | |
| 
 | |
| void ff_simple_idct_put_10(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct_add_10(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct_10(DCTELEM *block);
 | |
| /**
 | |
|  * Special version of ff_simple_idct_10() which does dequantization
 | |
|  * and scales by a factor of 2 more between the two IDCTs to account
 | |
|  * for larger scale of input coefficients.
 | |
|  */
 | |
| void ff_prores_idct(DCTELEM *block, const int16_t *qmat);
 | |
| 
 | |
| void ff_simple_idct_mmx(int16_t *block);
 | |
| void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
 | |
| void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
 | |
| 
 | |
| void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| 
 | |
| void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block);
 | |
| 
 | |
| #endif /* AVCODEC_SIMPLE_IDCT_H */
 |