Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:04:27 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 12:04:27 +0000 (14:04 +0200)
commitd31c0fcfa55a841bc47d44bedd407b2c623f939a
tree1053c826a19edcd6eff11f4f7db8d55cf8e113ab
parent07440c938073c6c83b8b3592dfade690bab9c19e
parentcdd2d73d315ecaf19ff49e64c91923275f1bda68
Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'

* commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68':
  hls: Don't check discard flags until the parent demuxer's streams actually exist
  hls: Copy the time base from the chained demuxer

Conflicts:
libavformat/hls.c

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