Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:25:02 +0000 (10:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:26:04 +0000 (10:26 +0200)
commit7dfe798d148bf4730cf23484bea15462424cd6b5
tree894a2fd028a477507187b6e24e4db58849604157
parentef1544740e023c26d93f9b11904ad1725139d5e7
parent06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd
Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'

* commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd':
  hls: Free packets when skipping packets when seeking

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