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)
* 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>
1  2 
configure
libavcodec/smacker.c

diff --cc configure
+++ b/configure
@@@ -2059,18 -1829,11 +2059,18 @@@ w64_muxer_deps="wav_muxer
  alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
  alsa_outdev_deps="alsa_asoundlib_h"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 +caca_outdev_deps="libcaca"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
  dv1394_indev_deps="dv1394 dv_demuxer"
  fbdev_indev_deps="linux_fb_h"
- jack_indev_deps="jack_jack_h sem_timedwait"
 +iec61883_indev_deps="libiec61883"
+ jack_indev_deps="jack_jack_h pthreads"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +libv4l2_indev_deps="libv4l2"
 +openal_indev_deps="openal"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
  pulse_indev_deps="libpulse"
Simple merge