Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Nov 2013 23:05:38 +0000 (00:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 00:12:24 +0000 (01:12 +0100)
commit5ded4332f195869df4b8b6b667cdb445113b8e34
treee226bac305b92bc0d8d3a6113fe270332510768d
parent4782c4284fa3856a9b6910fe5ff6e4fb1c65b58c
parent14abeaa43d021afdce9119d906891abe89c03b88
Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'

* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
Makefile
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
doc/Makefile