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>

diff --cc configure
index 4c5f4b3,dcda88e..774df50
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -122,18 -115,13 +122,17 @@@ Component options
    --disable-avcodec        disable libavcodec build
    --disable-avformat       disable libavformat build
    --disable-avutil         disable libavutil build
 +  --disable-swresample     disable libswresample build
    --disable-swscale        disable libswscale build
 -  --disable-avfilter       disable video filter support [no]
 -  --disable-avresample     disable libavresample build [no]
 +  --disable-postproc       disable libpostproc build
 +  --disable-avfilter       disable libavfilter build
 +  --enable-avresample      enable libavresample build [no]
    --disable-pthreads       disable pthreads [auto]
    --disable-w32threads     disable Win32 threads [auto]
-   --enable-x11grab         enable X11 grabbing [no]
 +  --disable-os2threads     disable OS/2 threads [auto]
    --disable-network        disable network support [no]
    --disable-dct            disable DCT code
 +  --disable-dwt            disable DWT code
    --disable-lsp            disable LSP code
    --disable-lzo            disable LZO decoder code
    --disable-mdct           disable MDCT code
@@@ -232,8 -203,8 +231,9 @@@ External library support
    --enable-libxavs         enable AVS encoding via xavs [no]
    --enable-libxvid         enable Xvid encoding via xvidcore,
                             native MPEG-4/Xvid encoder exists [no]
 +  --enable-openal          enable OpenAL 1.1 capture support [no]
    --enable-openssl         enable openssl [no]
+   --enable-x11grab         enable X11 grabbing [no]
    --enable-zlib            enable zlib [autodetect]
  
  Advanced options (experts only):