Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:16:19 +0000 (10:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:16:23 +0000 (10:16 +0100)
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/swfdec.c

Simple merge