diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-29 14:40:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-29 14:42:48 -0300 |
| commit | 2245476e5c451552f8f32a4a881f6b4968898a47 (patch) | |
| tree | 0fe4769926f0e9310d99077d64a41d3baf4249d0 /libavdevice | |
| parent | 5cc5130c813fd89e5a8b998e504908ef36bed0f1 (diff) | |
| download | ffmpeg-2245476e5c451552f8f32a4a881f6b4968898a47.tar.gz | |
avdevice: remove usage of deprecated setter and getter functions
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/avdevice.c | 4 | ||||
| -rw-r--r-- | libavdevice/decklink_dec.cpp | 2 | ||||
| -rw-r--r-- | libavdevice/libndi_newtek_dec.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 01c46924d1..72e1b67887 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -135,9 +135,9 @@ int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToD int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type, void *data, size_t data_size) { - if (!av_format_get_control_message_cb(s)) + if (!s->control_message_cb) return AVERROR(ENOSYS); - return av_format_get_control_message_cb(s)(s, type, data, data_size); + return s->control_message_cb(s, type, data, data_size); } int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s, diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index b4b9e02cec..e786dd85dc 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -959,7 +959,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) st->time_base.den = ctx->bmd_tb_den; st->time_base.num = ctx->bmd_tb_num; - av_stream_set_r_frame_rate(st, av_make_q(st->time_base.den, st->time_base.num)); + st->r_frame_rate = av_make_q(st->time_base.den, st->time_base.num)); switch((BMDPixelFormat)cctx->raw_format) { case bmdFormat8BitYUV: diff --git a/libavdevice/libndi_newtek_dec.c b/libavdevice/libndi_newtek_dec.c index 8cbcd9a1d2..5bbaa39786 100644 --- a/libavdevice/libndi_newtek_dec.c +++ b/libavdevice/libndi_newtek_dec.c @@ -189,7 +189,7 @@ static int ndi_create_video_stream(AVFormatContext *avctx, NDIlib_video_frame_t } st->time_base = NDI_TIME_BASE_Q; - av_stream_set_r_frame_rate(st, av_make_q(v->frame_rate_N, v->frame_rate_D)); + st->r_frame_rate = av_make_q(v->frame_rate_N, v->frame_rate_D)); tmp = av_mul_q(av_d2q(v->picture_aspect_ratio, INT_MAX), (AVRational){v->yres, v->xres}); av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, tmp.num, tmp.den, 1000); |