summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-17 20:40:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-17 20:49:01 +0200
commit3d40ba3d81276c659191b0de9653e9ec69c090f1 (patch)
tree79dc6edeb61840f3783430a83c5f64291743d9f3 /README.md
parenta3329a09f93455a44ff3c9c64886c4da1f66bcfb (diff)
parent4bebce06175a6a15253c341c180d95cd97c9494b (diff)
downloadffmpeg-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 'README.md')
0 files changed, 0 insertions, 0 deletions