On Thu, May 12, 2011 at 10:35:20AM +0200, Kostya wrote: > On Mon, May 09, 2011 at 12:51:24PM +0200, Stefano Sabatini wrote: > > Format detection and internal frame initialization is moved to a > > separate init_image() function, which is called when all the tags have > > been read, and so both BitsPerSample and SamplesPerPixel information > > has been collected. > > > > Fix decoding of file 11.tiff, trac issue number #167. > > > > Based on a patch by Kostya Shishkov <kostya.shish...@gmail.com>. > > --- > > libavcodec/tiff.c | 118 > > ++++++++++++++++++++++++++++------------------------- > > 1 files changed, 62 insertions(+), 56 deletions(-) > > looks ok to me
Stefano, please refresh your patch to apply against HEAD: biurrun@passion:~/src/priv/libav $ git am -s stefano.mbox Applying: tiff: add support to TIFF_SAMPLES_PER_PIXEL case in tiff_decode_tag() error: patch failed: libavcodec/tiff.c:38 error: libavcodec/tiff.c: patch does not apply Patch failed at 0001 tiff: add support to TIFF_SAMPLES_PER_PIXEL case in tiff_decode_tag() When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Diego _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
