* qatar/master:
  hls: Create an AVProgram for each variant

Conflicts:
	libavformat/hls.c

See: 23db5418Merged-by: Michael Niedermayer <michaelni@gmx.at>