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
..
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-05-24 04:35:08 +02:00
2011-05-15 04:44:07 +02:00
2011-05-12 04:51:24 +02:00
2011-05-21 05:32:03 +02:00
2011-05-18 05:42:42 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-22 13:41:13 +02:00
2011-05-22 04:53:19 +02:00
2011-05-19 13:00:31 +02:00
2011-05-23 04:29:51 +02:00
2011-05-15 04:44:07 +02:00
2011-05-24 22:24:08 +02:00
2011-05-15 04:44:07 +02:00
2011-06-02 07:07:15 -07:00
2011-06-02 05:12:10 +02:00
2011-06-06 01:31:02 +02:00
2011-06-08 05:25:28 +02:00
2011-06-03 05:19:30 +02:00
2011-05-15 04:44:07 +02:00
2011-06-02 05:12:10 +02:00
2011-06-06 03:33:58 +02:00
2011-05-20 05:48:22 +02:00
2011-04-30 01:58:26 +02:00
2011-04-27 20:08:37 +02:00
2011-05-15 04:44:07 +02:00
2011-05-15 04:44:07 +02:00
2011-05-18 05:42:42 +02:00
2011-05-15 04:44:07 +02:00
2011-05-20 17:52:21 +02:00
2011-05-23 04:29:51 +02:00