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)
* 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>
1  2 
libavformat/hls.c

Simple merge