libretro/FFmpeg
1
0 Fork 0
mirror of https://github.com/libretro/FFmpeg.git synced 2026-11-13 04:34:56 -10:00
Code Issues 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 <[email protected]>
This commit is contained in:
Michael Niedermayer committed 2011-07-27 10:40:34 +02:00
2 parents c617d7b86a 001e600c3b
commit f52ad8cedd
2 files changed
+3 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

configure
Vendored
+1 -1
View File
@@ -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"
libavcodec/dctref.h
+2 -4
View File
@@ -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 */