diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 11:57:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 11:57:33 +0100 |
| commit | 42a095d095b597dd855d843138bfda2d4ea36368 (patch) | |
| tree | b8846b0dde3dd5a39c89e05884a594904c5c2ed3 /libavformat/rtmppkt.c | |
| parent | a105c1f204bd820246a18b6af6d85f5a4839e000 (diff) | |
| parent | 3c3b8003a13d9c3668c0bb6d79d2376da3b2b352 (diff) | |
Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'
* commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352':
rtmpproto: Simplify code for copying data into the output packet
Conflicts:
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions