OSDN Git Service

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)
commitd1e2d59f23a9c69b0b088a9a528b29f20c2948c1
tree1c7fb61eda9558303a46c593150dcfd07ced8485
parent205b2ba3d677330e023aac2f4bd3f624039256b9
parent56ffde3f619076650bdc6003cc683cf2f563463f
Merge remote-tracking branch 'cehoyos/master'

* 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>