Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 16:03:21 +0000 (18:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 16:03:27 +0000 (18:03 +0200)
* cus/stable:
  ffplay: fix build with disabled avfilter

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

Trivial merge