Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 22:30:47 +0000 (23:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 22:30:47 +0000 (23:30 +0100)
commit82031e41f8203f32c7cedc2f43dc1b3bd2f55d62
treeec72b8e0c06b9f0298256338768650e96e2a49f8
parent222e7549a74d75fcf91440ebcff997ee5416296d
parent596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4
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@gmx.at>