diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-02-14 12:00:30 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 00:08:12 +0100 |
| commit | 12c71f648cbc95ab5a3a9138ead31d1f017d34ed (patch) | |
| tree | d02c62a40e27cc63ce4c8ea861467758fef24119 /libavdevice | |
| parent | 003be0a9c33e84c823757d5b5e8c67e0bbc953a7 (diff) | |
| download | ffmpeg-12c71f648cbc95ab5a3a9138ead31d1f017d34ed.tar.gz | |
dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.
Also cleanup exported symbols
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/dshow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index c85ac0b22e..4991414e6b 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -370,7 +370,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, if (!pformat_set) { enum AVPixelFormat pix_fmt = dshow_pixfmt(bih->biCompression, bih->biBitCount); 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); if (codec_id == AV_CODEC_ID_NONE || !codec) { 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; } 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; } 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... } 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) { av_log(avctx, AV_LOG_ERROR, "Unknown compression type. " "Please report type 0x%X.\n", (int) bih->biCompression); |