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-06-01 13:02:08 +02:00
2011-06-08 05:25:28 +02:00
2011-05-11 13:43:30 +02:00
2011-03-17 17:26:45 +01:00
2011-03-29 02:27:13 +02:00
2011-05-20 10:14:00 +02:00
2011-04-22 03:54:30 +02:00
2011-05-27 12:48:43 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-04-24 03:41:22 +02:00
2011-05-27 10:41:46 +02:00
2011-04-19 01:17:59 +02:00
2011-05-21 03:36:26 +02:00
2011-06-08 01:30:52 +02:00
2011-06-05 13:31:47 +02:00
2011-03-13 18:45:29 -04:00
2011-04-24 03:41:22 +02:00
2011-03-17 17:26:45 +01:00
2011-05-25 18:29:55 +02:00
2011-05-29 03:34:35 +02:00
2011-04-10 04:31:54 +02:00
2011-03-29 02:46:11 +02:00
2011-05-09 04:13:55 +02:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-05-28 12:15:55 +02:00
2011-04-08 01:35:43 +02:00
2011-06-05 13:17:38 +02:00
2011-04-08 02:50:13 +02:00
2009-03-30 10:39:20 +00:00
2008-02-08 19:17:46 +00:00
2011-03-17 17:26:45 +01:00
2010-03-05 08:34:31 +00:00
2011-01-30 03:41:47 +01:00
2010-06-27 14:31:50 +00:00
2011-03-25 09:48:31 -04:00
2011-02-09 03:33:54 +01:00
2009-03-03 15:35:20 +00:00