generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.

Browse Source 
Also cleanup exported symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
rogerdpack 2013-02-14 12:00:30 -07:00 committed by Michael Niedermayer
parent 003be0a9c3
commit 12c71f648c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/dshow.c
View File

@ -370,7 +370,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
if (!pformat_set) { if (!pformat_set) {
enum AVPixelFormat pix_fmt = dshow_pixfmt(bih->biCompression, bih->biBitCount); enum AVPixelFormat pix_fmt = dshow_pixfmt(bih->biCompression, bih->biBitCount);
if (pix_fmt == AV_PIX_FMT_NONE) { if (pix_fmt == AV_PIX_FMT_NONE) {
enum AVCodecID codec_id = ff_codec_get_id(ff_codec_bmp_tags, bih->biCompression); enum AVCodecID codec_id = ff_codec_get_id(avformat_get_riff_video_tags(), bih->biCompression);
AVCodec *codec = avcodec_find_decoder(codec_id); AVCodec *codec = avcodec_find_decoder(codec_id);
if (codec_id == AV_CODEC_ID_NONE || !codec) { if (codec_id == AV_CODEC_ID_NONE || !codec) {
av_log(avctx, AV_LOG_INFO, " unknown compression type 0x%X", (int) bih->biCompression); av_log(avctx, AV_LOG_INFO, " unknown compression type 0x%X", (int) bih->biCompression);
@ -388,7 +388,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
continue; continue;
} }
if (ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO) { if (ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO) {
if (ctx->video_codec_id != ff_codec_get_id(ff_codec_bmp_tags, bih->biCompression)) if (ctx->video_codec_id != ff_codec_get_id(avformat_get_riff_video_tags(), bih->biCompression))
goto next; goto next;
} }
if (ctx->pixel_format != AV_PIX_FMT_NONE && if (ctx->pixel_format != AV_PIX_FMT_NONE &&
@ -779,7 +779,7 @@ dshow_add_device(AVFormatContext *avctx,
codec->color_range = AVCOL_RANGE_MPEG; // just in case it needs this... codec->color_range = AVCOL_RANGE_MPEG; // just in case it needs this...
} }
if (codec->pix_fmt == AV_PIX_FMT_NONE) { if (codec->pix_fmt == AV_PIX_FMT_NONE) {
codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, bih->biCompression); codec->codec_id = ff_codec_get_id(avformat_get_riff_video_tags(), bih->biCompression);
if (codec->codec_id == AV_CODEC_ID_NONE) { if (codec->codec_id == AV_CODEC_ID_NONE) {
av_log(avctx, AV_LOG_ERROR, "Unknown compression type. " av_log(avctx, AV_LOG_ERROR, "Unknown compression type. "
"Please report type 0x%X.\n", (int) bih->biCompression); "Please report type 0x%X.\n", (int) bih->biCompression);

2
libavformat/libavformat.v
View File

@ -32,8 +32,6 @@ 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; 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 av_export const AVCodecTag ff_codec_bmp_tags[]; extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_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);