Merge commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:43:31 +0000 (21:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:43:43 +0000 (21:43 +0100)
* commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8':
  movenc: Factorize adding fragment info into a separate function

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

Simple merge
Simple merge