Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Apr 2011 00:29:09 +0000 (02:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Apr 2011 00:29:09 +0000 (02:29 +0200)
commit989fb05fe344d9666db858e0577c44969625184e
tree294cb628ae90187c545eb7b0a28de2d304898888
parent2671ab3996672c43b02076daca5bf00c5a6f1c68
parent2441003d3fdc01545690c2f397efd7acfd876d6c
Merge remote branch 'qatar/master'

* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/vorbisdec.c
libavformat/applehttp.c
libavformat/oggdec.c