FFmpeg/libavcodec
Michael Niedermayer 7163bbefa2 Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
	libavcodec/mace.c

See: 6df1cfa7e4d488051d7b5033c0c69df970db9f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-17 15:16:01 +02:00
..
2013-08-13 15:45:08 +02:00
2013-09-04 16:37:25 +02:00
2013-09-14 17:35:48 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-12 19:40:29 +02:00
2013-09-14 10:45:14 +00:00
2013-09-03 19:34:04 +02:00
2013-08-12 19:40:29 +02:00
2013-08-05 10:14:14 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-17 01:43:30 +02:00
2013-07-29 20:58:20 +02:00
2013-07-31 20:01:43 +00:00
2013-07-30 21:12:34 +00:00
2013-08-07 21:13:12 +02:00
2013-08-21 20:29:05 +00:00
2013-08-12 19:40:29 +02:00
2013-08-21 18:35:58 +00:00
2013-09-17 02:00:15 +02:00
2013-08-26 19:26:01 +00:00
2013-07-28 22:27:36 +00:00
2013-09-08 15:13:33 +00:00
2013-09-08 15:13:33 +00:00
2013-07-28 22:27:36 +00:00
2013-09-02 12:32:32 +02:00
2013-07-28 22:27:36 +00:00
2013-08-09 23:02:48 +02:00
2013-08-12 19:40:29 +02:00
2013-08-26 19:26:00 +00:00
2013-08-29 23:23:22 +02:00
2013-08-29 22:52:04 +02:00
2013-08-29 22:52:04 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 19:29:10 +00:00
2013-08-05 10:15:03 +02:00
2013-08-02 16:45:58 +00:00
2013-09-04 14:29:20 +02:00
2013-08-14 14:04:05 +00:00
2013-09-02 08:32:24 +02:00