]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 12:44:04 +0000 (13:44 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 12:44:04 +0000 (13:44 +0100)
* commit 'e4d5b55193109d08be47c42d320334546c006b51':
  rangecoder: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/rangecoder.h

Simple merge