Ticket #47189: FFMpegh_build_against_ffmpeg.diff

src/FFmpeg.h

@@ -685 +685 @@
       (AVFormatContext *s, AVDictionary **options),
       (s, options)
    );
+#if defined(IS_FFMPEG_PROJECT)
+   FFMPEG_FUNCTION_WITH_RETURN(
+      AVOutputFormat*,
+      av_oformat_next,
+      (const AVOutputFormat *f),
+      (f)
+   );
+#else
    FFMPEG_FUNCTION_WITH_RETURN(
       AVOutputFormat*,
       av_oformat_next,
       (AVOutputFormat *f),
       (f)
    );
+#endif
    FFMPEG_FUNCTION_WITH_RETURN(
       AVCodec*,
       av_codec_next,
@@ -752 +761 @@
       (AVFifoBuffer *f),
       (f)
    );
+#if defined(IS_FFMPEG_PROJECT)
+   FFMPEG_FUNCTION_WITH_RETURN(
+      int,
+      av_fifo_size,
+      (const AVFifoBuffer *f),
+      (f)
+   );
+#else
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_fifo_size,
       (AVFifoBuffer *f),
       (f)
    );
+#endif
    FFMPEG_FUNCTION_WITH_RETURN(
       void*,
       av_malloc,
@@ -798 +816 @@
       (AVFifoBuffer *f, unsigned int size),
       (f, size)
    );
+#if defined(IS_FFMPEG_PROJECT)
+   FFMPEG_FUNCTION_WITH_RETURN(
+      AVDictionaryEntry *,
+      av_dict_get,
+      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
+      (m, key, prev, flags)
+   );
+#else
    FFMPEG_FUNCTION_WITH_RETURN(
       AVDictionaryEntry *,
       av_dict_get,
       (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
       (m, key, prev, flags)
    );
+#endif
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_dict_set,