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)
commit9042c8a4db9bde455ee50bb27f84f0dfadae8315
tree21f39b058f955087437bea513c141dd23f67c27a
parent118a1c2f4c2385f629a7be8479cbb20eaf391cac
parentb198e33ad8b3e2f11d525cd6bcd211d6298ba81c
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build with disabled avfilter

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