Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00
Code Issues Releases Wiki Activity

Revert defining different headers depending on FFMPEG_VERSION.

Browse Source 
The preprocessor definition FFMPEG_VERSION cannot be used to determine whether
the libav* header are provided by the FFmpeg or libav project. Therefore an own
proprocessor definition is needed to make the differentiatiion.

IS_FFMPEG_PROJECT should be set by configure instead of hard-coding it in
FFmpeg.h.
This commit is contained in:
benjamin.drung@gmail.com 2014-06-02 21:35:48 +00:00
parent 729d7e31a3
commit 7e72c4712b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/FFmpeg.h
View File

@ -16,6 +16,10 @@ Describes shared object that is used to access FFmpeg libraries.
#if !defined(__AUDACITY_FFMPEG__) #if !defined(__AUDACITY_FFMPEG__)
#define __AUDACITY_FFMPEG__ #define __AUDACITY_FFMPEG__
// TODO: Determine whether the libav* headers come from the FFmpeg or libav
// project and set IS_FFMPEG_PROJECT depending on it.
#define IS_FFMPEG_PROJECT 1
/* FFmpeg is written in C99. It uses many types from stdint.h. Because we are /* FFmpeg is written in C99. It uses many types from stdint.h. Because we are
* compiling this using a C++ compiler we have to put it in extern "C". * compiling this using a C++ compiler we have to put it in extern "C".
* __STDC_CONSTANT_MACROS is defined to make <stdint.h> behave like it * __STDC_CONSTANT_MACROS is defined to make <stdint.h> behave like it
@ -585,7 +589,7 @@ extern "C" {
(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options), (AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options),
(avctx, codec, options); (avctx, codec, options);
); );
#if defined(FFMPEG_VERSION) #if defined(IS_FFMPEG_PROJECT)
FFMPEG_FUNCTION_WITH_RETURN( FFMPEG_FUNCTION_WITH_RETURN(
int, int,
avcodec_decode_audio4, avcodec_decode_audio4,
@ -691,7 +695,7 @@ extern "C" {
(const AVCodec *c), (const AVCodec *c),
(c) (c)
); );
#if defined(FFMPEG_VERSION) #if defined(IS_FFMPEG_PROJECT)
FFMPEG_FUNCTION_WITH_RETURN( FFMPEG_FUNCTION_WITH_RETURN(
AVStream*, AVStream*,
avformat_new_stream, avformat_new_stream,