Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:11:21 +0000 (14:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:11:21 +0000 (14:11 +0200)
commit2f9e97b32a7a541095654bed2e8763dd79c98366
tree48572ff1a2ceb6deb102a91e0f1b6fa13397b2e5
parentd31c0fcfa55a841bc47d44bedd407b2c623f939a
parentc11e33a3d9665dd1fc5dbdecdd03a4860ac6a622
Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'

* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
  hls: Set stream offset before opening a chained demuxer

Conflicts:
libavformat/hls.c

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