Merge commit '2cc3936599b6fc63143036659653d1be0624360f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 19:45:47 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 19:45:56 +0000 (21:45 +0200)
* commit '2cc3936599b6fc63143036659653d1be0624360f':
  dashenc: Add a publishTime field in dynamic manifests

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

Simple merge