diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 16:12:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 16:12:37 +0200 |
| commit | d5caf10c4f09a401254cb703d3003be8f94e2fa0 (patch) | |
| tree | ea9ba563184388cd5878627a655b8f598d916de7 /libavfilter/vf_overlay.c | |
| parent | e473f7e6595d2787919bf6e7b5bfdd25fa636ce6 (diff) | |
| parent | e9df8f7725cfe53272877f1d8595a7a0cba853cc (diff) | |
| download | ffmpeg-d5caf10c4f09a401254cb703d3003be8f94e2fa0.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Accept incomplete http cookies without domain.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions