mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'
* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64': lavu: add missing log.h include in timer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a3be0c334e
|
@ -32,6 +32,8 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
#if ARCH_ARM
|
#if ARCH_ARM
|
||||||
# include "arm/timer.h"
|
# include "arm/timer.h"
|
||||||
#elif ARCH_BFIN
|
#elif ARCH_BFIN
|
||||||
|
|
Loading…
Reference in New Issue