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-31 02:08:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2010-03-09 17:39:19 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-24 02:16:11 +01:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-29 20:01:04 +02:00
2011-03-19 13:33:20 +00:00
2011-05-14 02:19:58 +02:00
2011-06-02 21:03:54 +02:00
2011-06-02 21:03:54 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-30 03:11:54 +02:00
2011-04-22 10:21:21 +02:00
2011-06-08 05:25:28 +02:00
2011-04-19 19:03:44 +02:00
2011-05-09 21:23:45 +02:00
2011-03-19 13:33:20 +00:00
2011-06-04 17:03:25 +01:00
2011-03-19 13:33:20 +00:00
2011-06-08 05:25:28 +02:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-06 03:33:58 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-08 05:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2010-01-16 04:49:02 +00:00
2011-04-22 03:54:30 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-09 04:50:56 +02:00
2011-05-11 12:26:25 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-05 11:47:14 +01:00
2011-05-11 20:41:19 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-07 03:17:42 +02:00
2011-05-01 00:26:05 +02:00
2011-06-06 03:33:58 +02:00
2011-06-06 03:33:58 +02:00
2011-06-08 05:25:28 +02:00
2011-06-08 05:25:28 +02:00
2011-04-27 03:51:04 +02:00
2011-03-19 13:33:20 +00:00
2011-05-28 18:25:40 +02:00
2011-06-06 11:34:45 +02:00
2011-05-12 20:07:39 +02:00
2011-04-21 03:37:05 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-08 05:25:28 +02:00
2011-06-08 05:25:28 +02:00
2011-04-21 03:37:05 +02:00
2011-03-19 13:33:20 +00:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-27 03:51:04 +02:00
2011-03-19 13:33:20 +00:00