Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 16:49:33 +0000 (17:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 16:49:36 +0000 (17:49 +0100)
* cehoyos/master:
  Allow muxing h264 into ts with startcode "001" instead of "0001".
  lavfi/fade: Do not overread input buffer.

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

Trivial merge