Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:44:14 +0000 (12:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:44:14 +0000 (12:44 +0200)
commitee83f667afd276cbec15651948ed8477936b3631
tree3758d65f102b00da9cdec1694fec325cd50334bb
parent4d13d440ee75321523be88fff1f38f3a154c53b5
parent7968059e5c3cd8f91407f379c11bbf71a1b84c74
Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'

* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
libavformat/mpegts.c

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