Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:19:20 +0000 (10:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:19:20 +0000 (10:19 +0200)
* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6':
  hlsproto: Store all durations in AV_TIME_BASE

Conflicts:
libavformat/hlsproto.c

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

Simple merge