Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 10:17:46 +0000 (12:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 10:17:46 +0000 (12:17 +0200)
commitbf0547504b733b22f0498e84721b3bc712dce451
tree0fea123019a63f287c79d71cbc48b666a3faf3b1
parent42f5fc716e932b7b015d6605f2d88fc0eea4488b
parentbce70f8170592599a4f2f5f02606c1246e88df57
Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

* commit 'bce70f8170592599a4f2f5f02606c1246e88df57':
  configure: make avconv select (a)trim filters

Conflicts:
configure

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