[FFmpeg-cvslog] Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 01:18:48 2014 +0100| [dcbc748ad11b7a683c54b4afc350f734adcded4e] | committer: Michael Niedermayer

Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'

* commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27':
  jvdec: K&R formatting cosmetics

Conflicts:
	libavcodec/jvdec.c
	libavformat/jvdec.c

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

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