diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
| commit | b0554fec0470bf59b0582c80697d28646e37b854 (patch) | |
| tree | 1f111a02df3a1e29f29ed963fb32ccfa72f2cce1 /libavcodec/mpeg4audio.h | |
| parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
| parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
| download | ffmpeg-b0554fec0470bf59b0582c80697d28646e37b854.tar.gz | |
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
| -rw-r--r-- | libavcodec/mpeg4audio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 64839c6617..0f410455f5 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -40,7 +40,7 @@ typedef struct MPEG4AudioConfig { int ps; ///< -1 implicit, 1 presence } MPEG4AudioConfig; -extern const int avpriv_mpeg4audio_sample_rates[16]; +extern av_export const int avpriv_mpeg4audio_sample_rates[16]; extern const uint8_t ff_mpeg4audio_channels[8]; /** |