[SCM] fdk-aac/master: Merge tag 'upstream/0.1.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7bfaf72a36c6996200c2b3df455dd0d6838c3e0f
X-Git-Newrev: 287883964757f059ccbd5e45656255616169d910

The following commit has been merged in the master branch:
commit 45a69ddb33ec7afe1d10e556146d9c9f440c5638
Merge: 7bfaf72a36c6996200c2b3df455dd0d6838c3e0f b305eb6055a82f67117ae816cf3987ce0f46c873
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Sat Jan 16 17:42:12 2016 +0000

    Merge tag 'upstream/0.1.4'
    
    Upstream version 0.1.4

diff --combined .gitignore
index 224e7f0,263e5aa..53649fe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,29 +1,30 @@@
+ *.o
+ *.lo
+ *.la
+ .deps
+ .libs
+ .dirstamp
+ Makefile
+ Makefile.in
+ aclocal.m4
+ autom4te.cache
+ configure
+ fdk-aac.pc
+ config.guess
+ config.log
+ config.status
+ config.sub
+ depcomp
+ install-sh
+ libtool
+ ltmain.sh
+ m4/libtool.m4
+ m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
+ missing
+ stamp-h1
+ aac-enc
+ compile
 +.pc/

-- 
fdk-aac packaging