Michael Niedermayer 016cca4504 Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532' ...

* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-07-22 22:02:48 +02:00

1.7 KiB

Raw Blame History

View Raw