[FFmpeg-cvslog] Merge commit 'c117da9d3e0db7dc311d817054988364b3ef4587'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 11:17:50 2014 +0100| [a63ec9d5737a79ea78e781f90405e5bef4326468] | committer: Michael Niedermayer

Merge commit 'c117da9d3e0db7dc311d817054988364b3ef4587'

* commit 'c117da9d3e0db7dc311d817054988364b3ef4587':
  lpc: remove unneeded {}

See: 85929b9caa90553f9e1bbd7a3ead03ef2ade4d71
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a63ec9d5737a79ea78e781f90405e5bef4326468
---