generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'

Browse Source 
* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
  Split off floating point AAN (I)DCT into separate components

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/dct-test.c
	libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-08 00:54:55 +02:00
parent 1a59a28838 1274ea8dba
commit f044fc0372
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegvideo_enc.c
View File

@@ -90,8 +90,10 @@ void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64],
for (qscale = qmin; qscale <= qmax; qscale++) {
int i;
if (fdsp->fdct == ff_jpeg_fdct_islow_8 ||
fdsp->fdct == ff_jpeg_fdct_islow_10 ||
fdsp->fdct == ff_faandct) {
#if CONFIG_FAANDCT
fdsp->fdct == ff_faandct ||
#endif /* CONFIG_FAANDCT */
fdsp->fdct == ff_jpeg_fdct_islow_10) {
for (i = 0; i < 64; i++) {
const int j = s->idsp.idct_permutation[i];
/* 16 <= qscale * quant_matrix[i] <= 7905