diff options
| -rw-r--r-- | libavcodec/apng.h (renamed from libavformat/apng.h) | 6 | ||||
| -rw-r--r-- | libavcodec/pngdec.c | 2 | ||||
| -rw-r--r-- | libavformat/apngdec.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/apng.h b/libavcodec/apng.h index 2abf011d2d..41249e0df0 100644 --- a/libavformat/apng.h +++ b/libavcodec/apng.h @@ -24,8 +24,8 @@ * APNG common header */ -#ifndef AVFORMAT_APNG_H -#define AVFORMAT_APNG_H +#ifndef AVCODEC_APNG_H +#define AVCODEC_APNG_H enum { APNG_DISPOSE_OP_NONE = 0, @@ -38,4 +38,4 @@ enum { APNG_BLEND_OP_OVER = 1, }; -#endif /* AVFORMAT_APNG_H */ +#endif /* AVCODEC_APNG_H */ diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 9e52d0bee0..229a6d6884 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -26,10 +26,10 @@ #include "avcodec.h" #include "bytestream.h" #include "internal.h" +#include "apng.h" #include "png.h" #include "pngdsp.h" #include "thread.h" -#include "libavformat/apng.h" #include <zlib.h> diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 276d7659d8..189480e41a 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -26,13 +26,13 @@ * @see http://www.w3.org/TR/PNG */ -#include "apng.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" +#include "libavcodec/apng.h" #include "libavcodec/png.h" #include "libavcodec/bytestream.h" |