Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 01:03:08 +0000 (02:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 01:03:47 +0000 (02:03 +0100)
* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
  dashenc: Change the duration fields to 64 bit

Conflicts:
libavformat/dashenc.c

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

Simple merge