Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 20:33:13 +0000 (21:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Dec 2013 20:33:13 +0000 (21:33 +0100)
commit0f242e62b4b4f4da08b4e8e49aa1e4c2900a51f6
treea6eda1aece06d81dc915478dcef6fedeea3b84c3
parent1e3718e2a1e70ae13785c566a197552eac7eda39
parent79d9884e9590c28a0a7ca802a3ba54f2ff4ee423
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Merge pthreads/w32threads OBJS declarations

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile