[FFmpeg-cvslog] avformat/mpegenc, mpegts. mxfenc: Mark (de)muxers declarations as internal
Andreas Rheinhardt
git at videolan.org
Wed Mar 5 01:34:56 EET 2025
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Mar 2 15:56:31 2025 +0100| [56cfbe3c9fcc45b95a5ef0e103721aec348e32de] | committer: Andreas Rheinhardt
avformat/mpegenc, mpegts. mxfenc: Mark (de)muxers declarations as internal
Otherwise compilers might emit code that presumes there to be
a GOT which can't be fixed by the linker.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56cfbe3c9fcc45b95a5ef0e103721aec348e32de
---
libavformat/mpegenc.c | 9 +++++----
libavformat/mpegts.c | 3 ++-
libavformat/mxfenc.c | 5 +++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 6b6763c30f..30a034a418 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -24,6 +24,7 @@
#include <stdint.h>
#include "libavutil/attributes.h"
+#include "libavutil/attributes_internal.h"
#include "libavutil/fifo.h"
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
@@ -88,10 +89,10 @@ typedef struct MpegMuxContext {
int preload;
} MpegMuxContext;
-extern const FFOutputFormat ff_mpeg1vcd_muxer;
-extern const FFOutputFormat ff_mpeg2dvd_muxer;
-extern const FFOutputFormat ff_mpeg2svcd_muxer;
-extern const FFOutputFormat ff_mpeg2vob_muxer;
+EXTERN const FFOutputFormat ff_mpeg1vcd_muxer;
+EXTERN const FFOutputFormat ff_mpeg2dvd_muxer;
+EXTERN const FFOutputFormat ff_mpeg2svcd_muxer;
+EXTERN const FFOutputFormat ff_mpeg2vob_muxer;
static int put_pack_header(AVFormatContext *ctx, uint8_t *buf,
int64_t timestamp)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 765bedec5c..54594b3a11 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -21,6 +21,7 @@
#include "config_components.h"
+#include "libavutil/attributes_internal.h"
#include "libavutil/buffer.h"
#include "libavutil/crc.h"
#include "libavutil/internal.h"
@@ -274,7 +275,7 @@ typedef struct PESContext {
int merged_st;
} PESContext;
-extern const FFInputFormat ff_mpegts_demuxer;
+EXTERN const FFInputFormat ff_mpegts_demuxer;
static struct Program * get_program(MpegTSContext *ts, unsigned int programid)
{
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index a482a6a352..ffb207576a 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -40,6 +40,7 @@
#include <inttypes.h>
#include <time.h>
+#include "libavutil/attributes_internal.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/random_seed.h"
@@ -66,8 +67,8 @@
#include "config.h"
#include "version.h"
-extern const FFOutputFormat ff_mxf_d10_muxer;
-extern const FFOutputFormat ff_mxf_opatom_muxer;
+EXTERN const FFOutputFormat ff_mxf_d10_muxer;
+EXTERN const FFOutputFormat ff_mxf_opatom_muxer;
#define IS_D10(s) ((s)->oformat == &ff_mxf_d10_muxer.p)
#define IS_OPATOM(s) ((s)->oformat == &ff_mxf_opatom_muxer.p)
More information about the ffmpeg-cvslog
mailing list