Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:24:06 +0000 (04:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:24:06 +0000 (04:24 +0200)
commit12f7253d0ea11c44ac01e1727a2724df060530a8
tree1bae6e243c09c56f1b0ad1ee09405941060beb17
parentf6c524a9399f854602975c7c83c377fc7a4c0d5e
parent82de8d71118f4eafd6a43e9ea9169bd411793798
Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'

* commit '82de8d71118f4eafd6a43e9ea9169bd411793798':
  mpegts: Update the PSI/SI table only if the version change

Conflicts:
libavformat/mpegts.c

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