highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  configure: spelling cosmetics
  dctref: make sure function declarations match between .c and .h file
  x86: fix build with gcc 4.7

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-07-27 10:40:34 +02:00
commit f52ad8cedd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dctref.h
View File

@ -22,10 +22,8 @@
#ifndef AVCODEC_DCTREF_H #ifndef AVCODEC_DCTREF_H
#define AVCODEC_DCTREF_H #define AVCODEC_DCTREF_H
#include "dsputil.h" void ff_ref_fdct(short *block);
void ff_ref_idct(short *block);
void ff_ref_fdct(DCTELEM *block);
void ff_ref_idct(DCTELEM *block);
void ff_ref_dct_init(void); void ff_ref_dct_init(void);
#endif /* AVCODEC_DCTREF_H */ #endif /* AVCODEC_DCTREF_H */