diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-27 10:40:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-27 10:40:34 +0200 |
| commit | f52ad8ceddf3078dbfef7ab437ca8600a1f96ef2 (patch) | |
| tree | b2269696636ba3f82fcc6b0e9c2b92a15fb3b793 | |
| parent | c617d7b86a69aefafb0a5d6a9f916f9c97974c8f (diff) | |
| parent | 001e600c3b8668191f96d7a1e46da0d7fff546de (diff) | |
| download | ffmpeg-f52ad8ceddf3078dbfef7ab437ca8600a1f96ef2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/dctref.h | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -3488,5 +3488,5 @@ pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$ext pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" -pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" diff --git a/libavcodec/dctref.h b/libavcodec/dctref.h index be481f07b0..f6fde8863a 100644 --- a/libavcodec/dctref.h +++ b/libavcodec/dctref.h @@ -22,10 +22,8 @@ #ifndef AVCODEC_DCTREF_H #define AVCODEC_DCTREF_H -#include "dsputil.h" - -void ff_ref_fdct(DCTELEM *block); -void ff_ref_idct(DCTELEM *block); +void ff_ref_fdct(short *block); +void ff_ref_idct(short *block); void ff_ref_dct_init(void); #endif /* AVCODEC_DCTREF_H */ |