Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:45:06 +0000 (17:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 16:45:06 +0000 (17:45 +0100)
commit5f8f9dc4362b12c78189fb9e3d8587fae4fee987
tree5200866be8a227b532f6225557c2a384555e6bcd
parent6db37c9468051ff34cac58fa428bc5d86fc1ee45
parent45235ac488363e3360bf2f2275102d1ec66eba0f
Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
configure

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