wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/libavcodec/x86
History
Michael Niedermayer f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-17 04:51:33 +02:00
..
ac3dsp.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
ac3dsp_mmx.c
cavsdsp_mmx.c
dct32_sse.c
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 branch 'qatar/master' 2011-05-15 04:44:07 +02:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
fdct_mmx.c
fft.c
fft.h
fft_3dn.c
fft_3dn2.c
fft_mmx.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
fft_sse.c
fmtconvert.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
fmtconvert_mmx.c
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 FSF address copy paste error in some license headers. 2011-05-14 21:32:31 +02:00
h264_i386.h
h264_idct.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_intrapred.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00
h264_intrapred_init.c Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. 2011-05-10 07:24:36 -04: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 branch 'qatar/master' 2011-05-17 04:51:33 +02:00
idct_mmx.c
idct_mmx_xvid.c
idct_sse2_xvid.c
idct_xvid.h
lpc_mmx.c
Makefile Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx.c
mpegvideo_mmx_template.c Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
png_mmx.c Fix add_paeth_prediction_mmx for rgb48 2011-04-27 20:08:37 +02:00
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 branch 'qatar/master' 2011-05-15 04:44:07 +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
x86util.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +02:00