Merge pull request #4503 from popcornmix/texture_leak
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 10 Apr 2014 16:50:27 +0000 (10:50 -0600)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 10 Apr 2014 16:50:27 +0000 (10:50 -0600)
[rbp] Fixes for hangs and leaks in jpeg->texture code


Trivial merge