[FFmpeg-cvslog] Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 22 02:40:00 2014 +0200| [7f1543d46cd88e86bd662695d79c16c93892223e] | committer: Michael Niedermayer

Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'

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

Conflicts:
	configure

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f1543d46cd88e86bd662695d79c16c93892223e
---