1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer eadd4264ee Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
  adpcmenc: Use correct frame_size for Yamaha ADPCM.
  avcodec: add ff_samples_to_time_base() convenience function to internal.h
  adx parser: set duration
  mlp parser: set duration instead of frame_size
  gsm parser: set duration
  mpegaudio parser: set duration instead of frame_size
  (e)ac3 parser: set duration instead of frame_size
  flac parser: set duration instead of frame_size
  avcodec: add duration field to AVCodecParserContext
  avutil: add av_rescale_q_rnd() to allow different rounding
  pnmdec: remove useless .pix_fmts
  libmp3lame: support float and s32 sample formats
  libmp3lame: renaming, rearrangement, alignment, and comments
  libmp3lame: use the LAME default bit rate
  libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
  libmp3lame: cosmetics: remove some pointless comments
  libmp3lame: convert some debugging code to av_dlog()
  libmp3lame: remove outdated comment.
  libmp3lame: do not set coded_frame->key_frame.
  libmp3lame: improve error handling in MP3lame_encode_init()
  ...

Conflicts:
	doc/APIchanges
	libavcodec/libmp3lame.c
	libavcodec/pcxenc.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/sgienc.c
	libavcodec/utils.c
	libavformat/hls.c
	libavutil/avutil.h
	libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-21 05:10:12 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-02-11 01:22:22 +01:00
cabac.h
cavsdsp_mmx.c
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06:03 +01:00
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputil_yasm.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dwt_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06:03 +01:00
dwt.c
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft_3dn2.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
fft_sse.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
fft.h
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_chromamc_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_deblock_10bit.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_init.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
h264_qpel_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_qpel_mmx.c
h264_weight_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264dsp_mmx.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
idct_mmx.c cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pngdsp-init.c Merge remote-tracking branch 'qatar/master' 2012-01-31 02:46:26 +01:00
pngdsp.asm Partially revert "Fix png decoding on x86." 2012-02-10 23:18:52 +01:00
proresdsp-init.c
proresdsp.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
rv34dsp_init.c rv34: 1-pass inter MB reconstruction 2012-01-16 19:26:41 +01:00
rv34dsp.asm Use correct register size. 2012-01-17 08:41:39 +01:00
rv40dsp_init.c rv40: x86 SIMD for biweight 2012-01-30 23:58:25 +01:00
rv40dsp.asm Fix NASM compilation. 2012-02-03 20:42:30 +01:00
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
v210.asm Fix compilation without HAVE_AVX. 2012-02-12 21:42:31 +01:00
vc1dsp_mmx.c
vc1dsp_yasm.asm
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
w64xmmtest.c win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00