[FFmpeg-cvslog] Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 10:16:19 2012 +0100| [8dbc384f1527446b07eb6a673101f765e67f3eca] | committer: Michael Niedermayer

Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

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

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