[FFmpeg-cvslog] Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 11:16:54 2013 +0200| [6190aae90dbe05d9cebfbe1a33ff6acafffeaefd] | committer: Michael Niedermayer

Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb'

* commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb':
  configure: Don't do enable_deep_weak on disabled variables

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

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