Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:27:03 +0000 (11:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:28:24 +0000 (11:28 +0100)
commit8d026861f5c2afa3f445e2ffdc67b563b06e2dcb
treeddc971bf8cde959f92003e1ef3bb1a91fe23599c
parentebdae73125bd8fb71be72a5d9ae64c6fc7ccc130
parent0c5e380c2c266d2e8a13c000cc527529db837f10
Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10'

* commit '0c5e380c2c266d2e8a13c000cc527529db837f10':
  movenc: Don't rely on the fragment index for vc1 info gathering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h