On Sun, Apr 05, 2015 at 10:26:15AM +0200, Nicolas George wrote:
> Le tridi 13 germinal, an CCXXIII, Stephan Holljes a écrit :
> > From c01ec773448a76485895171cbfb296657d56da97 Mon Sep 17 00:00:00 2001
> > From: Stephan Holljes <klaxa1...@googlemail.com>
> > Date: Thu, 2 Apr 2015 22:49:07 +0200
> > Subject: [PATCH] libavformat/http.c: Add proof-of-concept http server.
> > 
> > Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
> > ---
> >  doc/protocols.texi |  3 +++
> >  libavformat/http.c | 31 +++++++++++++++++++++++++++++++
> >  2 files changed, 34 insertions(+)
> 
> I believe it is time to merge this.
> 
> I pushed it to my tree (with the stray empty line removed). Michael, please
> merge at your earliest convenience.

merged

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 1
"Used only once"    - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."

Attachment: signature.asc
Description: Digital signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to