aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2014-12-02 09:21:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-02 15:52:31 +0100
commit543fceba9ca9bb27afb0b81265578ae7b03a9dac (patch)
tree06ad9bb85ac0a7f5bda3d1a02658585a400616b9 /libavcodec
parentf151f5415a1904bf26cf49555fd9b24e1e00ff02 (diff)
downloadffmpeg-543fceba9ca9bb27afb0b81265578ae7b03a9dac.tar.gz
apng: move shared header from avformat to avcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/apng.h41
-rw-r--r--libavcodec/pngdec.c2
2 files changed, 42 insertions, 1 deletions
diff --git a/libavcodec/apng.h b/libavcodec/apng.h
new file mode 100644
index 0000000000..41249e0df0
--- /dev/null
+++ b/libavcodec/apng.h
@@ -0,0 +1,41 @@
+/*
+ * APNG common header
+ * Copyright (c) 2014 Benoit Fouet
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * APNG common header
+ */
+
+#ifndef AVCODEC_APNG_H
+#define AVCODEC_APNG_H
+
+enum {
+ APNG_DISPOSE_OP_NONE = 0,
+ APNG_DISPOSE_OP_BACKGROUND = 1,
+ APNG_DISPOSE_OP_PREVIOUS = 2,
+};
+
+enum {
+ APNG_BLEND_OP_SOURCE = 0,
+ APNG_BLEND_OP_OVER = 1,
+};
+
+#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>