Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Sep 2011 23:05:36 +0000 (01:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Sep 2011 23:05:36 +0000 (01:05 +0200)
* qatar/master:
  rtmp: Don't blindly skip the 4 trailer bytes from the FLV packets
  rtmp: Handle FLV packets written in more than one write call
  rv34: Check for invalid slice offsets

Conflicts:
libavformat/rtmpproto.c

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

Simple merge