[FFmpeg-cvslog] Merge commit '6dc6598692da3b0ebda2d768681786343f26a4f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 24 10:16:03 2013 +0200| [1152863a3f1bca11744ccfbc645185176d440c82] | committer: Michael Niedermayer

Merge commit '6dc6598692da3b0ebda2d768681786343f26a4f4'

* commit '6dc6598692da3b0ebda2d768681786343f26a4f4':
  configure: Simplify an expression with enabled_all.

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

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