generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
bd971ddaf4
ffmpeg/libavcodec/x86
History
Michael Niedermayer 11a1033c9f Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  build: cosmetics: Reorder some lists in a more logical fashion
  x86: pngdsp: Fix assembly for OS/2
  fate: add test for RTjpeg in nuv with frameheader
  rtmp: send check_bw as notification
  g723_1: clip argument for 15-bit version of normalize_bits()
  g723_1: use all LPC vectors in formant postfilter
  id3v2: Support v2.2 PIC
  avplay: fix build with lavfi disabled.
  avconv: split configuring filter configuration to a separate file.
  avconv: split option parsing into a separate file.
  mpc8: do not leave padding after last frame in buffer for the next decode call
  mpegaudioenc: list supported channel layouts.
  mpegaudiodec: don't print an error on > 1 frame in a packet.
  api-example: update to new audio encoding API.
  configure: add --enable/disable-random option
  doc: cygwin: Update list of FATE package requirements
  build: Remove all installed headers and header directories on uninstall
  build: change checkheaders to use regular build rules
  rtmp: Add a new option 'rtmp_subscribe'
  rtmp: Add support for subscribing live streams
  ...

Conflicts:
	Makefile
	common.mak
	configure
	doc/examples/decoding_encoding.c
	ffmpeg.c
	libavcodec/g723_1.c
	libavcodec/mpegaudiodec.c
	libavcodec/x86/pngdsp.asm
	libavformat/version.h
	library.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09 00:51:02 +02:00
..
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
cabac.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
cavsdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
deinterlace.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
dwt_yasm.asm
dwt.c dwt: Fix several warnings about incompatible pointer type 2012-07-27 19:36:17 +02:00
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
fft.c Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_chromamc_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_qpel_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_qpel_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
h264_weight_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_mmx.c x86: remove libmpeg2 mmx(ext) idct functions 2012-08-02 12:14:52 +01:00
idct_sse2_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
Makefile fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-08-02 22:14:40 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
mlpdsp.c
motion_est_mmx.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
pngdsp-init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
pngdsp.asm x86: pngdsp: Fix assembly for OS/2 2012-08-08 15:45:09 +02:00
proresdsp-init.c
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
rv34dsp_init.c x86: build: replace mmx2 by mmxext 2012-08-03 22:51:05 +02:00
rv34dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
rv40dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
snowdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
vp56_arith.h
vp56dsp_init.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
w64xmmtest.c