[FFmpeg-cvslog] Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 23:30:47 2014 +0100| [82031e41f8203f32c7cedc2f43dc1b3bd2f55d62] | committer: Michael Niedermayer

Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2

* commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4':
  parser: cosmetics: Drop some unnecessary parentheses
  parser: K&R formatting cosmetics
  parser: Remove commented-out cruft
  doc: name correct header
  af_volume: preserve frame properties

Conflicts:
	doc/APIchanges
	libavcodec/parser.c
	libavfilter/af_volume.c

All changes are already in our 2.2 branch, this is just for metadata

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

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