[vlc-commits] avcodec: remove AVCODEC_COMMON_MEMBERS

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jun 19 19:03:43 2017 +0300| [cf8cfdafb1e60b6c538bb6fe43198381a2eba7aa] | committer: Rémi Denis-Courmont

avcodec: remove AVCODEC_COMMON_MEMBERS

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

 modules/codec/avcodec/audio.c    | 3 ++-
 modules/codec/avcodec/avcodec.c  | 9 ---------
 modules/codec/avcodec/avcodec.h  | 4 ----
 modules/codec/avcodec/subtitle.c | 3 ++-
 modules/codec/avcodec/video.c    | 3 ++-
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 30630bf773..a7a5a42869 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -49,7 +49,8 @@
  *****************************************************************************/
 struct decoder_sys_t
 {
-    AVCODEC_COMMON_MEMBERS
+    AVCodecContext *p_context;
+    const AVCodec  *p_codec;
 
     /*
      * Output properties
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 1c15f6ef01..59e8abf1ef 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -42,15 +42,6 @@
 #include "chroma.h"
 #include "avcommon.h"
 
-/*****************************************************************************
- * decoder_sys_t: decoder descriptor
- *****************************************************************************/
-struct decoder_sys_t
-{
-    /* Common part between video and audio decoder */
-    AVCODEC_COMMON_MEMBERS
-};
-
 /****************************************************************************
  * Local prototypes
  ****************************************************************************/
diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 1ca97c8f87..ce7d2c8e31 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -232,10 +232,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec, AVCodecContext *, const AVCodec * );
    "main, low, ssr (not supported),ltp, hev1, hev2 (default: low). " \
    "hev1 and hev2 are currently supported only with libfdk-aac enabled libavcodec" )
 
-#define AVCODEC_COMMON_MEMBERS   \
-    AVCodecContext *p_context;  \
-    const AVCodec  *p_codec;
-
 #ifndef AV_VERSION_INT
 #   define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
 #endif
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index dd5c989c12..1c30b511cb 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -39,7 +39,8 @@
 #include "avcodec.h"
 
 struct decoder_sys_t {
-    AVCODEC_COMMON_MEMBERS
+    AVCodecContext *p_context;
+    const AVCodec  *p_codec;
     bool b_need_ephemer; /* Does the format need the ephemer flag (no end time set) */
 };
 
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 6526bcbea8..4b612d6b9e 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -53,7 +53,8 @@
  *****************************************************************************/
 struct decoder_sys_t
 {
-    AVCODEC_COMMON_MEMBERS
+    AVCodecContext *p_context;
+    const AVCodec  *p_codec;
 
     /* Video decoder specific part */
     date_t  pts;