Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 00:40:00 +0000 (02:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 00:40:00 +0000 (02:40 +0200)
commit7f1543d46cd88e86bd662695d79c16c93892223e
tree8e43cb545773b309b507afaaee1aeed8348dfd1d
parentc7168d1a22a67d908a556c2e1a4131932006fa22
parentb396bbad100a7493691d09b8dceba91e3cd28e2e
Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'

* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e':
  configure: Do not add extralibs to avresample .pc file

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure