diff options
| -rw-r--r-- | libavcodec/libavcodec.v | 7 | ||||
| -rw-r--r-- | libavdevice/dshow.c | 8 | ||||
| -rw-r--r-- | libavformat/libavformat.v | 11 |
3 files changed, 5 insertions, 21 deletions
diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v index 76e29f2a9e..be74cb3d85 100644 --- a/libavcodec/libavcodec.v +++ b/libavcodec/libavcodec.v @@ -3,10 +3,7 @@ LIBAVCODEC_$MAJOR { #deprecated, remove after next bump audio_resample; audio_resample_close; - ff_framenum_to_drop_timecode; - ff_framenum_to_smtpe_timecode; ff_raw_pix_fmt_tags; - ff_init_smtpe_timecode; ff_fft*; ff_mdct*; ff_dct*; @@ -15,11 +12,7 @@ LIBAVCODEC_$MAJOR { ff_simple_idct*; ff_aanscales; ff_faan*; - ff_mmx_idct; ff_fdct*; - fdct_ifast; - j_rev_dct; - ff_mmxext_idct; ff_idct_xvid*; ff_jpeg_fdct*; ff_dnxhd_get_cid_table; diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 2c098d4839..a54324994e 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -352,6 +352,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, VIDEO_STREAM_CONFIG_CAPS *vcaps = caps; BITMAPINFOHEADER *bih; int64_t *fr; + const AVCodecTag *const tags[] = { avformat_get_riff_video_tags(), NULL }; #if DSHOWDEBUG ff_print_VIDEO_STREAM_CONFIG_CAPS(vcaps); #endif @@ -369,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(avformat_get_riff_video_tags(), bih->biCompression); + enum AVCodecID codec_id = av_codec_get_id(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); @@ -387,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(avformat_get_riff_video_tags(), bih->biCompression)) + if (ctx->video_codec_id != av_codec_get_id(tags, bih->biCompression)) goto next; } if (ctx->pixel_format != AV_PIX_FMT_NONE && @@ -780,7 +781,8 @@ 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(avformat_get_riff_video_tags(), bih->biCompression); + const AVCodecTag *const tags[] = { avformat_get_riff_video_tags(), NULL }; + codec->codec_id = av_codec_get_id(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 0b476682ff..6ae64458c0 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -3,9 +3,6 @@ LIBAVFORMAT_$MAJOR { #FIXME those are for ffserver ff_inet_aton; ff_socket_nonblock; - ffm_set_write_index; - ffm_read_write_index; - ffm_write_write_index; ff_mpegts_parse_close; ff_mpegts_parse_open; ff_mpegts_parse_packet; @@ -21,17 +18,9 @@ LIBAVFORMAT_$MAJOR { ffurl_size; ffurl_write; ffurl_protocol_next; - url_open; - url_close; - url_write; #those are deprecated, remove on next bump url_*; - ff_timefilter_destroy; - ff_timefilter_new; - ff_timefilter_update; - ff_timefilter_reset; get_*; - put_*; ff_codec_get_id; local: *; }; |