Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 10:32:18 +0000 (12:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 11:01:41 +0000 (13:01 +0200)
commita4d3757b29b5e9affd97cbc4e6fc2d202378610b
tree11fcdd0668836e62b9b999292ff2a33bbc0bbbb8
parentecbd96ed23f07dfabc613b3fa2dcf394b2863203
parent90f9a5830b5d332de7ebb1ab45589f1870cbd65d
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
compat/w32pthreads.h
libavcodec/Makefile
libavcodec/frame_thread_encoder.c
libavcodec/pthread.c
libavcodec/vp8.h
libavformat/network.c