a52dec: Fix some merge mistakes
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:25:12 +0000 (15:25 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:25:12 +0000 (15:25 +0100)
commit69acbc53e960310c51392551fc3f14d9573dc184
tree3da0d2619d1fa9df5cc4d866ff8ce637500c61b6
parent31063f009861415c45bbaf16c5970a45cedde81b
a52dec: Fix some merge mistakes
ext/a52dec/gsta52dec.c