[SCM] libav/experimental: Make DeluxePaint Animation demuxer actually return the find_record() error code (issue 1739).
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:59:50 UTC 2013
The following commit has been merged in the experimental branch:
commit cbd3441eec2c2cf02d70c143e1625ccc2dc4c5e9
Author: Peter Ross <pross at xvid.org>
Date: Fri Feb 12 11:31:35 2010 +0000
Make DeluxePaint Animation demuxer actually return the find_record() error code (issue 1739).
Originally committed as revision 21769 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/anm.c b/libavformat/anm.c
index b80e429..2099dc9 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -39,7 +39,7 @@ typedef struct {
int page_table_offset;
#define MAX_PAGES 256 /** Deluxe Paint hardcoded value */
Page pt[MAX_PAGES]; /** page table */
- int page; /** current page */
+ int page; /** current page (or AVERROR_xxx code) */
int record; /** current record (with in page) */
} AnmDemuxContext;
@@ -185,7 +185,7 @@ static int read_packet(AVFormatContext *s,
return AVERROR(EIO);
if (anm->page < 0)
- return 0;
+ return anm->page;
repeat:
p = &anm->pt[anm->page];
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list