]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f540b8 5238541)
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)
* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
  des-test: Move a variable declaration to avoid an ifdef

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavutil/des.c patch | diff1 | diff2 | blob | history

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