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)
* commit '0c5e380c2c266d2e8a13c000cc527529db837f10':
  movenc: Don't rely on the fragment index for vc1 info gathering

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

Simple merge
Simple merge