Merge commit '3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 Nov 2015 14:56:55 +0000 (14:56 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 Nov 2015 14:57:20 +0000 (14:57 +0000)
commitf6e5b17abb44203bf830dda93d4927ce9a1d2675
treed0987379b83500c72527fbcd22ac786515802d55
parent6c9fb32ae47678ca1025d92f30926015d5e8a9ad
parent3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b
Merge commit '3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b'

* commit '3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b':
  movenc: Add a unit test for frag_discont with edit lists

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/movenc-test.c
tests/ref/fate/movenc