Michael Niedermayer
707138593a
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcmenc: cosmetics: pretty-printing
ac3dec: cosmetics: pretty-printing
yuv4mpeg: cosmetics: pretty-printing
shorten: remove dead initialization
roqvideodec: set AVFrame reference before reget_buffer.
bmp: fix some 1bit samples.
latmdec: add fate test for audio config change
oma: PCM support
oma: better format detection with small probe buffer
oma: clearify ambiguous if condition
wavpack: Properly clip samples during lossy decode
Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
Cleaned pixdesc.c file in libavutil
zmbv.c: coding style clean-up.
xan.c: coding style clean-up.
mpegvideo.c: code cleanup - first 500 lines.
Conflicts:
Changelog
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/zmbv.c
libavutil/log.c
libavutil/pixdesc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-05 00:11:57 +01:00
..
2011-11-28 00:24:21 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 02:50:35 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2011-11-26 01:12:08 +01:00
2011-11-26 01:12:08 +01:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2011-12-03 15:18:58 +01:00
2011-11-23 04:02:17 +01:00
2011-11-26 01:12:08 +01:00
2011-12-05 00:11:57 +01:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2011-12-03 15:18:58 +01:00
2011-12-03 15:18:58 +01:00
2011-10-13 16:50:20 +02:00
2011-10-16 22:32:41 +02:00
2011-10-16 21:51:28 +02:00
2011-11-20 02:46:06 +01:00
2011-11-23 04:02:17 +01:00
2011-11-06 11:52:59 +02:00
2011-11-23 04:02:17 +01:00
2011-12-05 00:11:57 +01:00
2011-10-22 19:49:27 +02:00
2011-12-05 00:11:57 +01:00
2011-10-13 06:00:03 +02:00
2011-11-05 23:25:20 +01:00
2011-11-23 04:02:17 +01:00
2011-11-23 04:02:17 +01:00
2011-11-23 04:02:17 +01:00
2011-11-23 04:02:17 +01:00
2011-11-20 15:02:36 +01:00
2011-11-29 16:09:56 +01:00
2011-11-17 02:44:33 +01:00
2011-11-17 02:44:33 +01:00
2011-12-05 00:11:57 +01:00
2011-11-25 04:34:44 +01:00
2011-11-28 02:44:05 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-03 00:35:20 +01:00
2011-11-24 16:55:45 +01:00
2011-11-23 04:02:17 +01:00
2011-11-29 00:20:29 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00