Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)
commit707138593af5c4783035d0b9cc2d7c8cb2137dfa
tree7ead2e3c73fd33764dede26546b0238bb40d484b
parent2f8b6e909dd733d9b722a5266ca516a9a5ba67e9
parentdc6d0430503ecd7ed0d81276f977b26b4c4bd916
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>
18 files changed:
Changelog
libavcodec/ac3dec.c
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/mpegvideo.c
libavcodec/shorten.c
libavcodec/wavpack.c
libavcodec/xan.c
libavcodec/zmbv.c
libavformat/oma.c
libavformat/yuv4mpeg.c
libavutil/crc.c
libavutil/lfg.c
libavutil/log.c
libavutil/pixdesc.c
libavutil/random_seed.c
libavutil/rational.c
libavutil/tree.c