]> git.sesse.net Git - ffmpeg/commit
Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Oct 2014 22:52:46 +0000 (00:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Oct 2014 22:56:26 +0000 (00:56 +0200)
commitbec077a1ab1fe19d8cb7a9cafd9731546d449c4b
treecf81083be395c5636616bdf5a863bcfea84d3849
parent0db1f2c2c78db18999fccd46a156408e5e87c8a1
parentbd239c9a2e151c0aeeb653a571f130aae7320894
Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'

* commit 'bd239c9a2e151c0aeeb653a571f130aae7320894':
  lavf: Don't drop both pts and dts if timestamps are invalid

Conflicts:
libavformat/utils.c
tests/ref/fate/vc1-ism

See: cd6851c5ef281e44af7028e08597c4dfb73d880f
Merged-by: Michael Niedermayer <michaelni@gmx.at>