Merge commit 'c44191039944526dd7eb6e536990b555837961f5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:12:48 +0000 (10:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:12:48 +0000 (10:12 +0200)
commit4971551fd215b8c7e9f3e20fc1536bb2150c84b4
tree2fc390807584b7460a0842f35a211567095136ad
parent5a270296cb014de3bf8d12aece0bdd7cecad5318
parentc44191039944526dd7eb6e536990b555837961f5
Merge commit 'c44191039944526dd7eb6e536990b555837961f5'

* commit 'c44191039944526dd7eb6e536990b555837961f5':
  hls: Store all durations in AV_TIME_BASE

Conflicts:
libavformat/hls.c

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