Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:31:38 +0000 (14:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:35:40 +0000 (14:35 +0200)
* qatar/master:
  hls: Create an AVProgram for each variant

Conflicts:
libavformat/hls.c

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

Simple merge