diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 04:06:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 04:06:56 +0100 |
| commit | a35f5c22339c87b1f1cb71201a5c886715a3dc8a (patch) | |
| tree | 15b2a7ab8f652366fc14e04f7c882d357cbb73ed /libavformat | |
| parent | 53b2083f4433be3c7d0a627d2df8290680eb83d8 (diff) | |
| parent | aa715cdcf5c6b6bdf43c0518d2e8c4f2a55399df (diff) | |
| download | ffmpeg-a35f5c22339c87b1f1cb71201a5c886715a3dc8a.tar.gz | |
Merge remote-tracking branch 'rdp/dshow_shared'
* rdp/dshow_shared:
dshow: attempt to build shared as well as static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/libavformat.v | 3 | ||||
| -rw-r--r-- | libavformat/riff.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v index 6c27b58845..6893f5241a 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -32,5 +32,8 @@ LIBAVFORMAT_$MAJOR { ff_timefilter_reset; get_*; put_*; + ff_codec_bmp_tags; + ff_raw_pix_fmt_tags; + ff_codec_get_id; local: *; }; diff --git a/libavformat/riff.h b/libavformat/riff.h index 8579a953c8..65b7cd1ed7 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -51,7 +51,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); -extern const AVCodecTag ff_codec_bmp_tags[]; +extern av_export const AVCodecTag ff_codec_bmp_tags[]; extern const AVCodecTag ff_codec_wav_tags[]; void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); |