ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jul 22 22:02:48 2014 +0200| [016cca45047483f508c05aa10d9448f6fcb6de0a] | committer: Michael Niedermayer
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532' * commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532': http: Use a constant for the supported header size Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=016cca45047483f508c05aa10d9448f6fcb6de0a --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog