diff options
| author | Benoit Fouet <benoit.fouet@free.fr> | 2014-12-02 09:21:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 15:52:31 +0100 |
| commit | 543fceba9ca9bb27afb0b81265578ae7b03a9dac (patch) | |
| tree | 06ad9bb85ac0a7f5bda3d1a02658585a400616b9 /libavformat | |
| parent | f151f5415a1904bf26cf49555fd9b24e1e00ff02 (diff) | |
apng: move shared header from avformat to avcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/apng.h | 41 | ||||
| -rw-r--r-- | libavformat/apngdec.c | 2 |
2 files changed, 1 insertions, 42 deletions
diff --git a/libavformat/apng.h b/libavformat/apng.h deleted file mode 100644 index 2abf011d2d..0000000000 --- a/libavformat/apng.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 AVFORMAT_APNG_H -#define AVFORMAT_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 /* AVFORMAT_APNG_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" |