virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'rdp/dshow_shared'

Browse Source 
* rdp/dshow_shared:
  dshow: attempt to build shared as well as static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-09 04:06:52 +01:00
parent 53b2083f44 aa715cdcf5
commit a35f5c2233
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/libavformat.v
View File

@@ -32,5 +32,8 @@ LIBAVFORMAT_$MAJOR {
ff_timefilter_reset; ff_timefilter_reset;
get_*; get_*;
put_*; put_*;
ff_codec_bmp_tags;
ff_raw_pix_fmt_tags;
ff_codec_get_id;
local: *; local: *;
}; };

2
libavformat/riff.h
View File

@@ -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); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); 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[]; extern const AVCodecTag ff_codec_wav_tags[];
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);