diff --git a/Formula/libav.rb b/Formula/libav.rb
index 53ab16cb19245..eb6fb850cc1f5 100644
--- a/Formula/libav.rb
+++ b/Formula/libav.rb
@@ -2,8 +2,10 @@
 
 class Libav < Formula
   homepage 'https://libav.org/'
-  url 'http://libav.org/releases/libav-9.9.tar.xz'
-  sha1 '5093a924543305b64d48fcd73b193ad4e7a0fa7f'
+  url 'http://libav.org/releases/libav-9.10.tar.xz'
+  sha1 '08274bc85e501bdb141022eb900dfe0d9eb89ad5'
+
+  head 'git://git.libav.org/libav.git'
 
   option "without-faac", "Disable AAC encoder via faac"
   option "without-lame", "Disable MP3 encoder via libmp3lame"
@@ -13,9 +15,14 @@ class Libav < Formula
   option "with-opencore-amr", "Enable AMR-NB de/encoding and AMR-WB decoding " +
     "via libopencore-amrnb and libopencore-amrwb"
   option "with-openjpeg", "Enable JPEG 2000 de/encoding via OpenJPEG"
+  option "with-openssl", "Enable SSL support"
+  option "with-rtmpdump", "Enable RTMP protocol support"
+  option "with-schroedinger", 'Enable Dirac video format'
+  option "with-sdl", "Enable avplay"
   option "with-speex", "Enable Speex de/encoding via libspeex"
   option "with-theora", "Enable Theora encoding via libtheora"
   option "with-libvorbis", "Enable Vorbis encoding via libvorbis"
+  option "with-libvo-aacenc", "Enable VisualOn AAC encoder"
   option "with-libvpx", "Enable VP8 de/encoding via libvpx"
 
   depends_on 'pkg-config' => :build
@@ -31,11 +38,18 @@ class Libav < Formula
   depends_on 'xvid' => :recommended
 
   depends_on :freetype => :optional
+  depends_on 'fdk-aac' => :optional
+  depends_on 'frei0r' => :optional
   depends_on 'gnutls' => :optional
+  depends_on 'libvo-aacenc' => :optional
   depends_on 'libvorbis' => :optional
   depends_on 'libvpx' => :optional
   depends_on 'opencore-amr' => :optional
   depends_on 'openjpeg' => :optional
+  depends_on 'opus' => :optional
+  depends_on 'rtmpdump' => :optional
+  depends_on 'schroedinger' => :optional
+  depends_on 'sdl' => :optional
   depends_on 'speex' => :optional
   depends_on 'theora' => :optional
 
@@ -52,32 +66,43 @@ def install
       "--enable-gpl",
       "--enable-nonfree",
       "--enable-version3",
+      "--enable-zlib",
       "--cc=#{ENV.cc}",
       "--host-cflags=#{ENV.cflags}",
       "--host-ldflags=#{ENV.ldflags}"
     ]
 
+    args << "--enable-frei0r" if build.with? 'frei0r'
+    args << "--enable-gnutls" if build.with? 'gnutls'
     args << "--enable-libfaac" if build.with? 'faac'
+    args << "--enable-libfdk-aac" if build.with? 'fdk-aac'
+    args << "--enable-libfreetype" if build.with? 'freetype'
     args << "--enable-libmp3lame" if build.with? 'lame'
-    args << "--enable-libx264" if build.with? 'x264'
-    args << "--enable-libxvid" if build.with? 'xvid'
-
-    args << "--enable-libvpx" if build.with? 'libvpx'
-    args << "--enable-gnutls" if build.with? 'gnutls'
+    args << "--enable-libopencore-amrnb" if build.with? 'opencore-amr'
+    args << "--enable-libopencore-amrwb" if build.with? 'opencore-amr'
     args << "--enable-libopenjpeg" if build.with? 'openjpeg'
-    args << "--enable-libfreetype" if build.with? 'freetype'
+    args << "--enable-libopus" if build.with? 'opus'
+    args << "--enable-librtmp" if build.with? 'rtmpdump'
+    args << "--enable-libschroedinger" if build.with? 'schroedinger'
     args << "--enable-libspeex" if build.with? 'speex'
-    args << "--enable-libvorbis" if build.with? 'libvorbis'
     args << "--enable-libtheora" if build.with? 'theora'
-    args << "--enable-libopencore-amrnb" if build.with? 'opencore-amr'
-    args << "--enable-libopencore-amrwb" if build.with? 'opencore-amr'
+    args << "--enable-libvo-aacenc" if build.with? 'libvo-aacenc'
+    args << "--enable-libvorbis" if build.with? 'libvorbis'
+    args << "--enable-libvpx" if build.with? 'libvpx'
+    args << "--enable-libx264" if build.with? 'x264'
+    args << "--enable-libxvid" if build.with? 'xvid'
+    args << "--enable-openssl" if build.with? 'openssl'
 
     system "./configure", *args
 
     system "make"
 
-    bin.install 'avconv', 'avprobe'
-    man1.install 'doc/avconv.1', 'doc/avprobe.1'
+    bin.install 'avconv', 'avprobe', 'avserver'
+    man1.install 'doc/avconv.1', 'doc/avprobe.1', 'doc/avserver.1'
+    if build.with? 'sdl'
+      bin.install 'avplay'
+      man1.install 'doc/avplay.1'
+    end
   end
 
   test do