Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:42:59 +0000 (04:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:43:41 +0000 (04:43 +0100)
commit6781ec6714329da32b2e08be78e951ad1eb71534
treed3cb318b44ea119491db85d3c1368516f436a237
parent5a1cd796e22473e1e64c4981720b0a09e2e9a13d
parent8b263331c5ebbb10b6ea521e9fd56751ba94254b
Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'

* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
  mpegts: check get16() return value

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