]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd0dbac bf0cef5)
Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 10:23:48 +0000 (12:23 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 10:23:54 +0000 (12:23 +0200)
* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
tests/checkasm/checkasm.c patch | diff1 | diff2 | blob | history

diff --cc tests/checkasm/checkasm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.