RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2014-02-05 23:48:15 +01:00
parent 5a633ec2dd a1e1f35203
commit a3be0c334e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/timer.h
View File

@ -32,6 +32,8 @@
#include "config.h"
#include "log.h"
#if ARCH_ARM
# include "arm/timer.h"
#elif ARCH_BFIN