Michael Niedermayer
|
c88503e3f6
|
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Conflicts:
compat/aix/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-07-19 10:56:10 +02:00 |
Diego Biurrun
|
439902e0d6
|
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Also fix a comment and an #endif comment.
|
2013-07-18 18:12:38 +02:00 |
|
Michael Niedermayer
|
a4d3757b29
|
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>
|
2013-05-24 13:01:41 +02:00 |
Anton Khirnov
|
90f9a5830b
|
w32pthreads: move from lavc to compat/
It will be used in other places than lavc.
|
2013-05-24 09:26:54 +02:00 |