[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 25 20:52:37 2014 +0100| [2673357048ebc7467063f62fa9bf8417b9f1c215] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

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

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