Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64' · a3be0c334e - Zikk

Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'

* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
  lavu: add missing log.h include in timer.h

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

Michael Niedermayer 11 years ago

parent

5a633ec2dd a1e1f35203

commit

a3be0c334e

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
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