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/mjpeg.h | |
| parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
| parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
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/mjpeg.h')
| -rw-r--r-- | libavcodec/mjpeg.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index d826278216..96e18545a7 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -138,16 +138,16 @@ static inline void put_marker(PutBitContext *p, int code) case 7: ret= (left + top)>>1; break;\ } -extern const uint8_t avpriv_mjpeg_bits_dc_luminance[]; -extern const uint8_t avpriv_mjpeg_val_dc[]; +extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_dc[]; -extern const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; -extern const uint8_t avpriv_mjpeg_bits_ac_luminance[]; -extern const uint8_t avpriv_mjpeg_val_ac_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[]; -extern const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; -extern const uint8_t avpriv_mjpeg_val_ac_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[]; void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, const uint8_t *bits_table, |