Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:34:28 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:34:28 +0000 (20:34 +0200)
commitd123d9abef52931f54701e5fb0ed569416258f75
tree75d6632334cb59ba0b057f03dc170877edc6872f
parentc24be3c4a2e15e7295bdef8183deb168b6835eb9
parent8dca0877e3e1457e9ec79ffa1ead1135aabb791c
Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'

* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
  mpegts: Return proper error code on invalid input data

Conflicts:
libavformat/mpegtsenc.c

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