wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/libavcodec/x86
History
Michael Niedermayer 99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 05:19:30 +02:00
..
ac3dsp.asm Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
cavsdsp_mmx.c
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2011-05-24 04:35:08 +02:00
deinterlace.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
dnxhd_mmx.c
dsputil_mmx.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
dsputil_mmx.h
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-05-21 05:32:03 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
fdct_mmx.c
fft.c Fix compilation with --disable-yasm. 2011-05-22 13:41:13 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
fft_3dn.c
fft_3dn2.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
fft_sse.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2011-05-23 04:29:51 +02:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2011-05-19 13:00:31 +02:00
h264_chromamc.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_deblock.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_deblock_10bit.asm Fix register types for LOAD_AB arguments, fixes compilation with NASM. 2011-05-24 22:24:08 +02:00
h264_i386.h
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
h264_idct_10bit.asm Cosmetic changes to h264_idct_10bit.asm. 2011-06-02 07:07:15 -07:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
h264_intrapred_init.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
h264_qpel_mmx.c
h264_weight.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
idct_mmx.c
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-02 05:12:10 +02:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
mpegvideo_mmx.c
mpegvideo_mmx_template.c
png_mmx.c
simple_idct_mmx.c
snowdsp_mmx.c
vc1dsp_mmx.c
vc1dsp_yasm.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
vp3dsp.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
vp8dsp-init.c
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
vp56_arith.h
vp56dsp.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
vp56dsp_init.c
x86inc.asm Add support for a.out object format to assembler macros. 2011-05-20 17:52:21 +02:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2011-05-23 04:29:51 +02:00