1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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-03 20:46:42 +01:00
2011-11-27 21:19:07 +01:00
2011-11-25 13:19:54 +00:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-11-14 18:14:20 +01:00
2011-11-12 20:07:31 +01:00
2011-12-02 17:40:40 -05:00
2011-12-02 17:40:40 -05:00
2011-12-03 03:00:49 +01:00
2011-12-03 03:00:44 +01:00
2011-11-19 04:07:26 +01:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-11-24 15:39:41 +01:00
2011-11-11 18:40:19 +01:00
2011-11-12 20:15:21 +01:00
2011-11-12 20:15:56 +01:00
2011-11-12 20:17:56 +01:00
2011-12-02 03:23:07 +01:00
2011-12-03 04:42:24 +01:00
2011-11-12 20:21:07 +01:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-12 20:49:53 +01:00