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)
commit7163bbefa26d634eae7bac8f0d891f2bca270eb9
tree9435643e06f694e96a038fd78381057c94c1aafd
parenta64b99503b962c757908e6796fc224aae23732ae
parente1f3847f860a1094a46be4c5f10db8df616c3135
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>
libavcodec/mace.c