]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'eef38316cab68aff080cf2b83c2427a734194e8d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:05:50 +0000 (16:05 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 15:05:50 +0000 (16:05 +0100)
* commit 'eef38316cab68aff080cf2b83c2427a734194e8d':
  texturedspenc: Avoid using separate variables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/texturedspenc.c

Simple merge