Merge pull request #4317 from FernetMenta/dts
authorjmarshallnz <jcmarsha@gmail.com>
Tue, 11 Mar 2014 04:11:01 +0000 (17:11 +1300)
committerjmarshallnz <jcmarsha@gmail.com>
Tue, 11 Mar 2014 04:11:01 +0000 (17:11 +1300)
ffmpeg: change due to revert of a backported commit


Trivial merge