diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 20:40:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 20:49:01 +0200 |
| commit | 3d40ba3d81276c659191b0de9653e9ec69c090f1 (patch) | |
| tree | 79dc6edeb61840f3783430a83c5f64291743d9f3 /libavformat/srtenc.c | |
| parent | a3329a09f93455a44ff3c9c64886c4da1f66bcfb (diff) | |
| parent | 4bebce06175a6a15253c341c180d95cd97c9494b (diff) | |
| download | ffmpeg-3d40ba3d81276c659191b0de9653e9ec69c090f1.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/http: remove special case for cookies attributes.
lavf/http: fix cookie parsing.
Reviewed-by: Ronald S. Bultje
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions