[FFmpeg-cvslog] Integrate accessors.h header into internal.h

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Aug  9 20:50:29 2013 +0200| [d4db7c334b6665b49d3f98bd5d7e0088f598d7b1] | committer: Reimar Döffinger

Integrate accessors.h header into internal.h

I have no idea why I added a separate header,
I think there is no good reason for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavcodec/utils.c    |    1 -
 libavformat/utils.c   |    1 -
 libavutil/accessors.h |    3 ---
 libavutil/frame.c     |    2 --
 libavutil/internal.h  |    4 ++++
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 063105a..c23805a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -26,7 +26,6 @@
  */
 
 #include "config.h"
-#include "libavutil/accessors.h"
 #include "libavutil/atomic.h"
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e44f716..8133019 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -25,7 +25,6 @@
 #include "libavcodec/internal.h"
 #include "libavcodec/raw.h"
 #include "libavcodec/bytestream.h"
-#include "libavutil/accessors.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
diff --git a/libavutil/accessors.h b/libavutil/accessors.h
deleted file mode 100644
index 471cdff..0000000
--- a/libavutil/accessors.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MAKE_ACCESSORS(str, name, type, field) \
-    type av_##name##_get_##field(const str *s) { return s->field; } \
-    void av_##name##_set_##field(str *s, type v) { s->field = v; }
diff --git a/libavutil/frame.c b/libavutil/frame.c
index df03e25..b0fdd49 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -27,8 +27,6 @@
 #include "mem.h"
 #include "samplefmt.h"
 
-#include "accessors.h"
-
 MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp)
 MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration)
 MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos)
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 680d600..786bd86 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -76,6 +76,10 @@
 
 #define FF_MEMORY_POISON 0x2a
 
+#define MAKE_ACCESSORS(str, name, type, field) \
+    type av_##name##_get_##field(const str *s) { return s->field; } \
+    void av_##name##_set_##field(str *s, type v) { s->field = v; }
+
 // Some broken preprocessors need a second expansion
 // to be forced to tokenize __VA_ARGS__
 #define E1(x) x