1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
Michael Niedermayer e88ca80dc3 Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
  adpcmdec: set AVCodec.sample_fmts
  twinvq: use planar sample format
  ralf: use planar sample format
  mpc7/8: use planar sample format
  iac/imc: use planar sample format
  dcadec: use float planar sample format
  cook: use planar sample format
  atrac3: use float planar sample format
  apedec: output in planar sample format
  8svx: use planar sample format

Conflicts:
	libavcodec/8svx.c
	libavcodec/dcadec.c
	libavcodec/mpc7.c
	libavcodec/mpc8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 17:27:52 +02:00
..
2012-10-01 22:24:17 +02:00
2012-09-21 01:03:31 +02:00
2012-09-29 16:25:29 +02:00
2012-09-30 00:13:54 +02:00
2012-09-25 18:10:11 +02:00
2012-09-07 12:36:00 +02:00
2012-09-30 14:05:04 +00:00
2012-10-01 10:24:28 +02:00
2012-10-02 02:24:55 +02:00
2012-09-26 01:56:01 +02:00
2012-09-15 22:13:21 +02:00
2012-09-23 21:12:23 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-09-18 17:37:41 +02:00
2012-09-19 11:05:36 -07:00
2012-10-01 22:24:17 +02:00
2012-09-30 13:39:38 +00:00
2012-09-23 15:24:08 +02:00