Reimar Döffinger
|
f51a072160
|
Fix compilation without HAVE_AVX.
%ifdef HAVE_AVX must now be %if HAVE_AVX.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
2012-02-12 21:42:31 +01:00 |
|
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 |
|
Ronald S. Bultje
|
3b15a6d742
|
config.asm: change %ifdef directives to %if directives.
This allows combining multiple conditionals in a single statement.
|
2012-01-27 10:19:57 +08:00 |
|
Carl Eugen Hoyos
|
ef3a19d595
|
Fix compilation with yasm-0.6.2
|
2012-01-12 16:35:49 +01:00 |
|
Michael Niedermayer
|
dc66951bb2
|
proresdsp: fix rounding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-12 22:18:35 +02:00 |
|
Michael Niedermayer
|
67dad8e7b1
|
proresdsp: Correct credits to point to the Author and not just the code this is based on.
Also change Libav to FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-12 22:09:40 +02:00 |
|
Michael Niedermayer
|
370d7ef2c7
|
proresdsp: Optimize series of padds out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-12 22:08:14 +02:00 |
|
Michael Niedermayer
|
6398c0f7e1
|
proresdsp.asm: Remove useless instructions.
|
2011-10-12 22:07:52 +02:00 |
|
Elvis Presley
|
b87d882578
|
proresdsp.asm: drop useless shifts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-12 19:42:53 +02:00 |
|
Ronald S. Bultje
|
e3f530feca
|
prores: idct sse2/sse4 optimizations.
~3.0-3.5x as fast as original C version, 1.6x as fast overall.
|
2011-10-11 07:50:48 -07:00 |
|