From 72ad96c8544cff11b66fa3412023c6c535703f74 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 17 Mar 2013 00:57:12 +0100
Subject: [PATCH 1/2] doc/developer: Clarify symbol naming prefixes section.

---
 doc/developer.texi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/developer.texi b/doc/developer.texi
index 1a87859530..cde87f1e5d 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -188,13 +188,16 @@ There are the following conventions for naming variables and functions:
 @item
 For local variables no prefix is required.
 @item
-For variables and functions declared as @code{static} no prefix is required.
+For file-scope variables and functions declared as @code{static}, no prefix
+is required.
 @item
-For variables and functions used internally by a library an @code{ff_}
-prefix should be used, e.g. @samp{ff_w64_demuxer}.
+For variables and functions visible outside of file scope, but only used
+internally by a library, an @code{ff_} prefix should be used,
+e.g. @samp{ff_w64_demuxer}.
 @item
-For variables and functions used internally across multiple libraries, use
-@code{avpriv_}. For example, @samp{avpriv_aac_parse_header}.
+For variables and functions visible outside of file scope, used internally
+across multiple libraries, use @code{avpriv_} as prefix, for example,
+@samp{avpriv_aac_parse_header}.
 @item
 For externally visible symbols, each library has its own prefix. Check
 the existing code and choose names accordingly.

From 2e2ec667416d8ed345491ac360fccc94e7a4772f Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 18 Mar 2013 22:27:03 +0100
Subject: [PATCH 2/2] configure: Enable hwaccels without external dependencies
 by default.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index f690db1f18..111f9fdc19 100755
--- a/configure
+++ b/configure
@@ -1908,6 +1908,9 @@ enable safe_bitstream_reader
 enable static
 enable swscale_alpha
 
+# By default, enable only those hwaccels that have no external dependencies.
+enable dxva2 vdpau
+
 # build settings
 SHFLAGS='-shared -Wl,-soname,$$(@F)'
 AVSERVERLDFLAGS=-Wl,-E