Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 09:40:10 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 09:40:15 +0000 (11:40 +0200)
commitc70e647a1587a6ecf50faf41a170876cc9272d53
treefa8aa34a8d3f8d69e1fca24c97d8dce783220001
parenteee8cb42d009eb4311087880fe18daf49026d1e0
parent5840473890440dbe0bd2cce530ebb3d93e187ae6
Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'

* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6':
  rtmp: Rewrite embedded flv handling

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