[FFmpeg-cvslog] Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  7 12:44:09 2014 +0100| [774d0c9dbaf580df1570fb46caf5917e20ca5193] | committer: Michael Niedermayer

Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
  dict: K&R formatting cosmetics

Conflicts:
	libavutil/dict.c

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

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