Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:03:02 +0000 (10:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:03:02 +0000 (10:03 +0200)
* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
libavformat/hls.c

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

Simple merge