diff options
| -rw-r--r-- | libavdevice/dshow.c | 6 | ||||
| -rw-r--r-- | libavformat/libavformat.v | 2 | ||||
| -rw-r--r-- | libavformat/riff.h | 2 |
3 files changed, 4 insertions, 6 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); diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v index 6893f5241a..0b476682ff 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -32,8 +32,6 @@ 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 65b7cd1ed7..70b2f76171 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 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[]; void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); |