[FFmpeg-cvslog] Merge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 18:42:43 2013 +0100| [bc140fb568df9c8ae341bbb2026d3609b7e81d6b] | committer: Michael Niedermayer

Merge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'

* commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf':
  mpeg4videoenc: restore macro parentheses

No change, as the bug was spoted by ubitux and not merged

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

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