[FFmpeg-cvslog] apng: move shared header from avformat to avcodec.

[Benoit Fouet]

ffmpeg | branch: master | Benoit Fouet <benoit.fouet at free.fr> | Tue Dec  2 09:21:47 2014 +0100| [543fceba9ca9bb27afb0b81265578ae7b03a9dac] | committer: Michael Niedermayer

apng: move shared header from avformat to avcodec.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=543fceba9ca9bb27afb0b81265578ae7b03a9dac
---

 {libavformat => libavcodec}/apng.h |    6 +++---
 libavcodec/pngdec.c                |    2 +-
 libavformat/apngdec.c              |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/apng.h b/libavcodec/apng.h
similarity index 93%
rename from libavformat/apng.h
rename to libavcodec/apng.h
index 2abf011..41249e0 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 9e52d0b..229a6d6 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 276d765..189480e 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"