[FFmpeg-cvslog] Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 14:04:27 2013 +0200| [d31c0fcfa55a841bc47d44bedd407b2c623f939a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d31c0fcfa55a841bc47d44bedd407b2c623f939a
---