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)
commit7cb5def1f38d2d1d801c5425a6c79be425e40196
tree8c6ffc9889592a6dcfa512c3292b52c446d0d9f1
parentc83442b0571370b946d3f8bb85c46879d62ab10a
parent3ffe32eb96e2414bdd87b353953d77fb83eca8ae
Merge remote-tracking branch 'qatar/master'

* 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>
libavformat/rtmpproto.c