On Tue, Oct 21, 2014 at 02:17:51AM +0530, Eejya Singh wrote: > Updated sample test after rebasing. Please find the patch attached. >
I did the little tweak below: [...] > From 798bc500b2df2c90d4fe42b8418059ab1b51fb8a Mon Sep 17 00:00:00 2001 > From: Eejya Singh <singh.ee...@gmail.com> > Date: Tue, 21 Oct 2014 01:55:39 +0530 > Subject: [PATCH] Added STL demuxer and decoder > > --- > Changelog | 2 +- > doc/general.texi | 1 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/codec_desc.c | 7 +++ > libavcodec/textdec.c | 18 +++++- > libavformat/Makefile | 1 + > libavformat/allformats.c | 1 + > libavformat/stldec.c | 141 > +++++++++++++++++++++++++++++++++++++++++++++++ > tests/fate/subtitles.mak | 3 + > tests/ref/fate/sub-stl | 29 ++++++++++ > 12 files changed, 204 insertions(+), 2 deletions(-) > create mode 100644 libavformat/stldec.c > create mode 100644 tests/ref/fate/sub-stl > > diff --git a/Changelog b/Changelog > index 1ab4364..99c4c71 100644 > --- a/Changelog > +++ b/Changelog > @@ -6,7 +6,7 @@ version <next>: > - SUP/PGS subtitle demuxer > - ffprobe -show_pixel_formats option > - CAST128 symmetric block cipher, ECB mode > - > +- STL subtitle demuxer and decoder restored the line dropped > version 2.4: > - Icecast protocol > - ported lenscorrection filter from frei0r filter > diff --git a/doc/general.texi b/doc/general.texi > index 2252f7b..0e79279 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -1032,6 +1032,7 @@ performance on systems without hardware floating point > support). > @item RealText @tab @tab X @tab @tab X > @item SAMI @tab @tab X @tab @tab X > @item SSA/ASS @tab X @tab X @tab X @tab X > +@item Spruce format(STL)@tab @tab X @tab @tab X Fixed spacing and order. [...] Also bumped libavcodec and libavformat versions/ So the patch is now queue and will be pushed soon. I would have pushed it right away, but the sample and test were updated not to endup with trailing whitespaces in the reference (because some git hooks reject it). So I have to wait for another 24 hours before pushing. But anyway, consider it as if it was upstream. Thank you and good work. -- Clément B.
pgpA4UnvAyDfV.pgp
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
