diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 14:31:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 14:32:08 +0200 |
| commit | b11265c9891e90187ed44c7dbfc84ec4305782d0 (patch) | |
| tree | 7b4f09c91b96c740dbb07b5b751682c6c64aae03 /libavcodec/dcadec.c | |
| parent | 36b9c27dae452e10b4fff3d10f836160a5b8fbbd (diff) | |
| parent | 4d40e073dcdef335215c124d340ea156bc4bdf13 (diff) | |
Merge commit '4d40e073dcdef335215c124d340ea156bc4bdf13'
* commit '4d40e073dcdef335215c124d340ea156bc4bdf13':
rtmpproto: Handle RTMP chunk size packets before the connect packet
Conflicts:
libavformat/rtmpproto.c
See: 36b9c27dae452e10b4fff3d10f836160a5b8fbbd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
0 files changed, 0 insertions, 0 deletions