]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a633ec a1e1f35)
Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 22:48:15 +0000 (23:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 22:48:41 +0000 (23:48 +0100)
* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
  lavu: add missing log.h include in timer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/timer.h patch | diff1 | diff2 | blob | history

diff --cc libavutil/timer.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.