diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 01:05:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 01:05:36 +0200 |
| commit | 7cb5def1f38d2d1d801c5425a6c79be425e40196 (patch) | |
| tree | 8c6ffc9889592a6dcfa512c3292b52c446d0d9f1 /libavdevice | |
| parent | c83442b0571370b946d3f8bb85c46879d62ab10a (diff) | |
| parent | 3ffe32eb96e2414bdd87b353953d77fb83eca8ae (diff) | |
| download | ffmpeg-7cb5def1f38d2d1d801c5425a6c79be425e40196.tar.gz | |
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>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions