[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 08:59:07 2013 +0200| [3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e] | committer: Michael Niedermayer

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 at gmx.at>

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