Michael Niedermayer
d552f616a2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (28 commits)
Remove some non-compiling debug messages.
ffplay: Fix non-compiling debug printf and replace it by av_dlog.
H264: x86 predict init cosmetics.
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
Move E-AC-3 encoder functions to a separate eac3enc.c file.
ac3enc: remove convenience macro, #define DEBUG
ac3enc: remove unused #define
vc1: re-initialize tables after width/height change.
APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
samplefmt: add av_get_bytes_per_sample()
iirfilter: fix biquad filter coefficients.
swscale: remove duplicate conversion routine in swScale().
swscale: add yuv2planar/packed function typedefs.
swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
swscale: reindent x86 init code.
swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
swscale: cosmetics.
swscale: remove alp/chr/lumSrcOffset.
swscale: un-special-case yuv2yuvX16_c().
shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
...
Conflicts:
doc/APIchanges
libavcodec/ac3enc.c
libavutil/avutil.h
libavutil/samplefmt.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-08 05:25:28 +02:00
Diego Biurrun
dc25d79f49
Drop unnecessary directory prefixes from #include directives.
2011-06-07 10:31:26 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Måns Rullgård
7de9da9ba7
Move prototypes for various dsputil init functions to dsputil.h
...
Originally committed as revision 22261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:36:49 +00:00
Ramiro Polla
cbd7836e88
mlp: Re-enable x86-optimized DSP functions.
...
Originally committed as revision 18936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 01:53:43 +00:00
Ramiro Polla
364f4a3620
Revert part of r18903:
...
MLP DSP functions x86-optimized.
12.59% overall speedup in x86_32
9.98% overall speedup in x86_64
compared to gcc 4.3.3
It breaks on x86_64 with PIC because the MANGLE macro appends (%%rip), which
is not wanted for labels.
Originally committed as revision 18904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 01:20:42 +00:00
Ramiro Polla
5624766d18
MLP DSP functions x86-optimized.
...
12.59% overall speedup in x86_32
9.98% overall speedup in x86_64
compared to gcc 4.3.3
Originally committed as revision 18903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 00:23:30 +00:00
Ramiro Polla
13bd2044d3
mlp: Simplify adressing of state and coeffs arrays for both filters by making
...
the arrays sequential.
Originally committed as revision 18841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 15:34:22 +00:00
Ramiro Polla
42e64bf874
mlp: include mlp.h and use MAX_CHANNELS instead of hardcoding value 8.
...
Originally committed as revision 18840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 15:30:43 +00:00
Ramiro Polla
bf4f19dc65
mlpdec: Move MLP's filter_channel() to dsputils.
...
Originally committed as revision 18721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-30 12:30:05 +00:00
