[FFmpeg-cvslog] Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 13:05:35 2013 +0200| [d781220991135811c6b0803cb7d02675c3e1e50a] | committer: Michael Niedermayer

Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c

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

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