Browse Source

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@gmx.de>
tags/n2.1
Reimar Döffinger 12 years ago
parent
commit
d4db7c334b
5 changed files with 4 additions and 7 deletions
  1. +0
    -1
      libavcodec/utils.c
  2. +0
    -1
      libavformat/utils.c
  3. +0
    -3
      libavutil/accessors.h
  4. +0
    -2
      libavutil/frame.c
  5. +4
    -0
      libavutil/internal.h

+ 0
- 1
libavcodec/utils.c View File

@@ -26,7 +26,6 @@
*/

#include "config.h"
#include "libavutil/accessors.h"
#include "libavutil/atomic.h"
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"


+ 0
- 1
libavformat/utils.c View File

@@ -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"


+ 0
- 3
libavutil/accessors.h View File

@@ -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; }

+ 0
- 2
libavutil/frame.c View File

@@ -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)


+ 4
- 0
libavutil/internal.h View File

@@ -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


Loading…
Cancel
Save