Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:17:28 +0000 (11:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:17:37 +0000 (11:17 +0100)
commitebdae73125bd8fb71be72a5d9ae64c6fc7ccc130
treeb71950eb62a365aa5be92b57fc1b4ad845be45b3
parent967afad03b3b6a1987c5c3079777657fde11e8c9
parentcf402d6fa88acd647cdff993429583bec8a34fdc
Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'

* commit 'cf402d6fa88acd647cdff993429583bec8a34fdc':
  rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpenc_mpegts.c