Merge commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 13:07:01 +0000 (14:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 13:07:35 +0000 (14:07 +0100)
* commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9':
  dashenc: Don't segment all video streams when one stream gets a keyframe

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

Simple merge