diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:56:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:56:22 +0200 |
| commit | 6b9cbc9a1164988b3517f4f160f7937e1644cdc3 (patch) | |
| tree | 18f7678940d2fb685312ba02cfdd4101ece5ba69 /libavfilter/vf_overlay.c | |
| parent | 8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f (diff) | |
| parent | 3b18857ab301d2a0b3e86e9d85eed76f0798a29c (diff) | |
| download | ffmpeg-6b9cbc9a1164988b3517f4f160f7937e1644cdc3.tar.gz | |
Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'
* commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c':
rtmppkt: Add method to read an AMF string that is not prefixed by its type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions