On Sat, Mar 11, 2017 at 5:47 PM, Michael Niedermayer <mich...@niedermayer.cc > wrote:
> On Sat, Mar 11, 2017 at 05:33:30PM +0530, Paras Chadha wrote: > > Here is the patch with all the changes mentioned above > > > > Signed-off-by: Paras <paraschadh...@gmail.com> > > --- > > Changelog | 1 + > > doc/general.texi | 2 + > > libavcodec/Makefile | 1 + > > libavcodec/allcodecs.c | 1 + > > libavcodec/avcodec.h | 1 + > > libavcodec/codec_desc.c | 7 + > > libavcodec/version.h | 4 +- > > libavcodec/xpmdec.c | 430 > > ++++++++++++++++++++++++++++++++++++++++++++++++ > > libavformat/img2.c | 1 + > > 9 files changed, 446 insertions(+), 2 deletions(-) > > create mode 100644 libavcodec/xpmdec.c > > Applying: Add XPM decoder > error: corrupt patch at line 33 > error: could not build fake ancestor > Patch failed at 0001 Add XPM decoder > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > Sorry, about that. Please look at the latest patch sent by me yesterday. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
