diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2017-04-03 10:08:29 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2017-04-03 10:08:29 -0400 |
| commit | 478f1c3d5e5463a284ea7efecfc62d47ba3be11a (patch) | |
| tree | d10182a9ab2d039c6d91d36a5c05f1630578467b /libavcodec/png.h | |
| parent | 1f50baa2b2da7fdbfccf0662883f38a763ff6619 (diff) | |
| download | ffmpeg-478f1c3d5e5463a284ea7efecfc62d47ba3be11a.tar.gz | |
png: split header state and data state in two separate variables.
Fixes a reported (but false) race condition in tsan for fate-apng:
WARNING: ThreadSanitizer: data race (pid=6274)
Read of size 4 at 0x7d680001ec78 by main thread (mutexes: write M1338):
#0 update_thread_context src/libavcodec/pngdec.c:1456 (ffmpeg+0x000000dacf0c)
[..]
Previous write of size 4 at 0x7d680001ec78 by thread T1 (mutexes: write M1335):
#0 decode_idat_chunk src/libavcodec/pngdec.c:737 (ffmpeg+0x000000dae951)
Diffstat (limited to 'libavcodec/png.h')
| -rw-r--r-- | libavcodec/png.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/png.h b/libavcodec/png.h index 948c2f714f..e967fcf38f 100644 --- a/libavcodec/png.h +++ b/libavcodec/png.h @@ -42,11 +42,6 @@ #define PNG_FILTER_VALUE_PAETH 4 #define PNG_FILTER_VALUE_MIXED 5 -#define PNG_IHDR 0x0001 -#define PNG_IDAT 0x0002 -#define PNG_ALLIMAGE 0x0004 -#define PNG_PLTE 0x0008 - #define NB_PASSES 7 #define PNGSIG 0x89504e470d0a1a0a |