[FFmpeg-cvslog] Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 12:17:46 2013 +0200| [bf0547504b733b22f0498e84721b3bc712dce451] | committer: Michael Niedermayer

Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

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

Conflicts:
	configure

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

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