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)
* commit 'c44191039944526dd7eb6e536990b555837961f5':
  hls: Store all durations in AV_TIME_BASE

Conflicts:
libavformat/hls.c

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

Simple merge