]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ceec9c a674b31)
Merge commit 'a674b31240e99a369059385b03582b35629d190f'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:12:43 +0000 (23:12 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:12:43 +0000 (23:12 +0000)
* commit 'a674b31240e99a369059385b03582b35629d190f':
  build: Ignore generated mpeg12framerate test binary

This commit is a noop, see fb791d28766bdacbb685a77c381101afc98ed58b

Merged-by: Mark Thompson <sw@jkqxz.net>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.