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)
commit33f178cd89caa06b0a5df3dba76e765e580b5593
treed30a3008893013223e5901576c9102517eb922f9
parent20f1ba2a7ab1cb84fbe82e337d4469d381bc9915
parent16c7667d7ebe7fbdb49af0c5d0be9eb86fdc5d39
Merge pull request #4317 from FernetMenta/dts

ffmpeg: change due to revert of a backported commit