[FFmpeg-cvslog] Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 17:45:06 2013 +0100| [5f8f9dc4362b12c78189fb9e3d8587fae4fee987] | committer: Michael Niedermayer

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 at gmx.at>

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