Files
FFmpeg/libavcodec
Michael Niedermayer 6788350281 Merge commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff'
* commit '50a65e7a540ce6747f81d6dbf6a602ad35be77ff': (24 commits)
  vmdaudio: set channel layout
  twinvq: validate sample rate code
  twinvq: set channel layout
  twinvq: validate that channels is not <= 0
  truespeech: set channel layout
  sipr: set channel layout
  shorten: validate that the channel count in the header is not <= 0
  ra288dec: set channel layout
  ra144dec: set channel layout
  qdm2: remove unneeded checks for channel count
  qdm2: make sure channels is not <= 0 and set channel layout
  qcelpdec: set channel layout
  nellymoserdec: set channels to 1
  libopencore-amr: set channel layout for amr-nb or if not set by the user
  libilbc: set channel layout
  dpcm: use AVCodecContext.channels instead of keeping a private copy
  imc: set channels to 1 instead of validating it
  gsmdec: always set channel layout and sample rate at initialization
  libgsmdec: always set channel layout and sample rate at initialization
  g726dec: do not validate sample rate
  ...

Conflicts:
	libavcodec/dpcm.c
	libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-02 14:20:33 +01:00
..
2012-10-08 02:09:28 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-10-09 04:00:55 +02:00
2012-08-15 22:32:06 +03:00
2012-09-21 01:03:31 +02:00
2012-10-29 21:13:50 +01:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-05-18 23:34:11 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-10-29 20:06:52 +00:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-09-04 18:37:54 +03:00
2012-10-12 17:58:15 +02:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-10-25 21:51:45 +00:00
2012-10-09 16:48:43 +02:00
2012-06-07 21:07:17 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-07-10 02:17:52 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-05-18 23:34:11 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-04-22 22:26:55 +02:00
2012-10-19 00:08:01 +00:00
2012-07-22 05:18:01 +02:00
2012-10-19 00:08:02 +00:00
2012-10-27 02:06:21 +02:00
2012-05-18 23:34:11 +02:00
2012-09-03 23:26:14 +02:00
2012-10-18 21:42:04 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 21:45:42 +02:00
2012-07-05 02:54:34 +00:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-06-29 20:43:30 +02:00
2012-10-13 16:02:09 +00:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-09-10 21:04:01 +02:00
2012-10-01 13:42:44 -04:00
2012-03-19 18:46:34 +01:00
2012-10-25 01:38:15 +02:00
2012-06-21 01:30:16 +00:00
2012-10-29 20:06:52 +00:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-12 18:17:10 +03:00
2012-10-10 16:48:13 +00:00
2012-10-27 04:32:40 +02:00
2012-03-13 01:14:04 +01:00
2012-09-23 15:24:08 +02:00
2012-06-29 20:43:30 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00