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)
* commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd':
  hls: Free packets when skipping packets when seeking

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

Simple merge