FFMPEG_COMMON_MEMBERS => AVCODEC_COMMON_MEMBERS

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 8e35ffabe054a9d5a63a471fcffb0b6715a97638..473d0665bba4aad2bf1f6e3fa2590bde4254ee82 100644 (file)
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -50,7 +50,7 @@
  *****************************************************************************/
 struct decoder_sys_t
 {
-    FFMPEG_COMMON_MEMBERS
+    AVCODEC_COMMON_MEMBERS
 
     /* Temporary buffer for libavcodec */
     int     i_output_max;

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index f2c416fc64e816d0a8d4faa82e1e51beb8139c69..9805ff1d8464b7e66ea75d17d871f30409f2668c 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -59,7 +59,7 @@
 struct decoder_sys_t
 {
     /* Common part between video and audio decoder */
-    FFMPEG_COMMON_MEMBERS
+    AVCODEC_COMMON_MEMBERS
 };
 
 /****************************************************************************

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 0449f51fa6382c99e0efdb7fd7a9dcb03d35c506..8047db96a926464d44c37130a2f03a2a34007951 100644 (file)
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -256,7 +256,7 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
    "for encoding the audio bitstream. It takes the following options: " \
    "main, low, ssr (not supported) and ltp (default: main)" )
 
-#define FFMPEG_COMMON_MEMBERS   \
+#define AVCODEC_COMMON_MEMBERS   \
     int i_cat;                  \
     int i_codec_id;             \
     const char *psz_namecodec;  \

diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 205e02b80c949977ac2b896b8611590acee35ef1..255243971bf14e4b70f8b198db9ddfc8fbff7ebb 100644 (file)
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -50,7 +50,7 @@
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
 
 struct decoder_sys_t {
-    FFMPEG_COMMON_MEMBERS
+    AVCODEC_COMMON_MEMBERS
 };
 
 static subpicture_t *ConvertSubtitle(decoder_t *, AVSubtitle *, mtime_t pts);

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 01ab782f3690ca1e1bd43e718b4605b524ec0180..dacf915d3f4263beaaf9326f4b6fc9d3c116220b 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -61,7 +61,7 @@
  *****************************************************************************/
 struct decoder_sys_t
 {
-    FFMPEG_COMMON_MEMBERS
+    AVCODEC_COMMON_MEMBERS
 
     /* Video decoder specific part */
     mtime_t i_pts;