[FFmpeg-cvslog] Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 10 23:27:16 2014 +0200| [2d99b4041fb84e18b2a5c93a84909b6cf5787754] | committer: Michael Niedermayer

Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'

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

Conflicts:
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d99b4041fb84e18b2a5c93a84909b6cf5787754
---