Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 21:27:16 +0000 (23:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 21:27:16 +0000 (23:27 +0200)
commit2d99b4041fb84e18b2a5c93a84909b6cf5787754
treeb3df16a93b30f78999b3ffd903d73c34ac7d8b4b
parentac26d7ea9da4758377624e633ca47cd01e2210d2
parent3f7e94eccd1c0d64679f2c4eda8bb942a158dfac
Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'

* commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac':
  mpegts: Move the option section to the bottom

Conflicts:
libavformat/mpegtsenc.c

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