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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-05-22 04:53:19 +02:00
parent 33adcdb531 71cc331cab
commit bf8bb94322
58 changed files with 500 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cbrt_tablegen.h
View File

@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef CBRT_TABLEGEN_H
#define CBRT_TABLEGEN_H
#ifndef AVCODEC_CBRT_TABLEGEN_H
#define AVCODEC_CBRT_TABLEGEN_H
#include <stdint.h>
#include <math.h>
@@ -48,4 +48,4 @@ static void cbrt_tableinit(void)
}
#endif /* CONFIG_HARDCODED_TABLES */
#endif /* CBRT_TABLEGEN_H */
#endif /* AVCODEC_CBRT_TABLEGEN_H */