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-12-05 00:11:57 +01:00
2011-12-04 01:02:37 +01:00
2011-12-02 00:51:11 +01:00
2011-12-04 01:02:37 +01:00
2011-11-24 00:33:20 +01:00
2011-10-10 03:50:58 +02:00
2011-11-24 03:32:24 +01:00
2011-09-22 17:39:30 +02:00
2011-11-19 02:00:06 +01:00
2011-11-07 15:13:16 +01:00
2011-10-10 03:50:58 +02:00