Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:59:07 +0000 (08:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 06:59:07 +0000 (08:59 +0200)
commit3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e
tree733e987f3d178a93c4377871e00261600e7eba81
parent2ad28840b3fb90d9f000b676853846792e05bd68
parent268bb88544d9a5256992a9817e60972461359865
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/smacker.c