Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:16:01 +0000 (15:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:16:01 +0000 (15:16 +0200)
* 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>
1  2 
libavcodec/mace.c

Simple merge