diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-17 09:28:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-20 21:06:57 +0200 |
| commit | 59a9a235811dc5f6a2c8b631a320968a06a867d1 (patch) | |
| tree | 48ff43883a93962dd8808b5b94b7654c41b428ce /libavcodec/mpeg4audio.h | |
| parent | 82ab61f9015659419e0a2766ee031c367e3f2908 (diff) | |
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
Diffstat (limited to 'libavcodec/mpeg4audio.h')
| -rw-r--r-- | libavcodec/mpeg4audio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index c729c04660..d6730b97b3 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -40,7 +40,7 @@ typedef struct { int ps; ///< -1 implicit, 1 presence } MPEG4AudioConfig; -extern const int ff_mpeg4audio_sample_rates[16]; +extern const int avpriv_mpeg4audio_sample_rates[16]; extern const uint8_t ff_mpeg4audio_channels[8]; /** * Parse MPEG-4 systems extradata to retrieve audio configuration. @@ -49,7 +49,7 @@ extern const uint8_t ff_mpeg4audio_channels[8]; * @param[in] buf_size Extradata size. * @return On error -1 is returned, on success AudioSpecificConfig bit index in extradata. */ -int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size); +int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size); enum AudioObjectType { AOT_NULL, @@ -101,6 +101,6 @@ enum AudioObjectType { #define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE ///<marker and the comment -int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb); +int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb); #endif /* AVCODEC_MPEG4AUDIO_H */ |