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)
commit5a270296cb014de3bf8d12aece0bdd7cecad5318
tree1ca325405258c53f6d2b3de88829ee95f1d0970a
parent947f2d4d34f29a8bc51fd4a97718b1c163d7a55d
parente1d5b244761cf69db655ad7ece1dbf2c13dd4fce
Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'

* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
libavformat/hls.c

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