Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 11:58:21 +0000 (13:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 11:59:27 +0000 (13:59 +0200)
commit07440c938073c6c83b8b3592dfade690bab9c19e
tree3b1931abad1c326635569947f0d07ff450a0b3b5
parentf7bc03bcaff5b15e566110f73db0f1fc0d24a717
parenteb33ba04e03d9f36e23fffd442510c824be709c3
Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'

* commit 'eb33ba04e03d9f36e23fffd442510c824be709c3':
  hls: Return all packets from a previous variant before moving on to the next one

Conflicts:
libavformat/hls.c

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