* 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
Unified · Split
| @@ -3488,5 +3488,5 @@ pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$ext · 3487 unmodified lines | |||
| 3488 | pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" | 3488 | pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" |
| 3489 | pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" | 3489 | pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" |
| 3490 | pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" | 3490 | pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" |
| 3491 | pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" | 3491 | pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" |
| 3492 | pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" | 3492 | pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" |
| @@ -22,10 +22,8 @@ · 21 unmodified lines | |||
| 22 | #ifndef AVCODEC_DCTREF_H | 22 | #ifndef AVCODEC_DCTREF_H |
| 23 | #define AVCODEC_DCTREF_H | 23 | #define AVCODEC_DCTREF_H |
| 24 | 24 | ||
| 25 | #include "dsputil.h" | 25 | void ff_ref_fdct(short *block); |
| 26 | 26 | void ff_ref_idct(short *block); | |
| 27 | void ff_ref_fdct(DCTELEM *block); | ||
| 28 | void ff_ref_idct(DCTELEM *block); | ||
| 29 | void ff_ref_dct_init(void); | 27 | void ff_ref_dct_init(void); |
| 30 | 28 | ||
| 31 | #endif /* AVCODEC_DCTREF_H */ | 29 | #endif /* AVCODEC_DCTREF_H */ |