From: Michael Niedermayer Date: Tue, 25 Nov 2014 10:17:50 +0000 (+0100) Subject: Merge commit 'c117da9d3e0db7dc311d817054988364b3ef4587' X-Git-Tag: n2.5~180 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=a63ec9d5737a79ea78e781f90405e5bef4326468;hp=0aa208837e247d0e031755e031202e567c5e82fb Merge commit 'c117da9d3e0db7dc311d817054988364b3ef4587' * commit 'c117da9d3e0db7dc311d817054988364b3ef4587': lpc: remove unneeded {} See: 85929b9caa90553f9e1bbd7a3ead03ef2ade4d71 Merged-by: Michael Niedermayer ---