1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master'
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
cabac.h cabac: Try to disable problematic ASM for gcc-llvm 4.2.1 2012-01-11 22:30:21 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +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-01-26 02:23:56 +01:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
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 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_init.c
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +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
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Fix compilation without HAVE_AVX, HAVE_YASM etc. 2012-01-14 23:09:39 +01:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
proresdsp-init.c
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +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.c
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 with yasm-0.6.2 2012-01-12 16:35:49 +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