vlc | branch: master | Filip Roséen <[email protected]> | Thu Jul 26 02:42:40 2018 +0200| [5e4cd2e34e3367dd62e7dba601c1c7bcaa2abbed] | committer: Thomas Guillem
sout: transcode: designated init in decoder_owner_callbacks Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e4cd2e34e3367dd62e7dba601c1c7bcaa2abbed --- modules/stream_out/transcode/audio.c | 4 ++-- modules/stream_out/transcode/spu.c | 4 ++-- modules/stream_out/transcode/video.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c index b2c3c08749..47d9f3062a 100644 --- a/modules/stream_out/transcode/audio.c +++ b/modules/stream_out/transcode/audio.c @@ -119,8 +119,8 @@ int transcode_audio_init( sout_stream_t *p_stream, const es_format_t *p_fmt, static const struct decoder_owner_callbacks dec_cbs = { .audio = { - audio_update_format, - decoder_queue_audio, + .format_update = audio_update_format, + .queue = decoder_queue_audio, }, }; id->p_decoder->cbs = &dec_cbs; diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c index d35bc75cf2..8908336666 100644 --- a/modules/stream_out/transcode/spu.c +++ b/modules/stream_out/transcode/spu.c @@ -96,8 +96,8 @@ int transcode_spu_init( sout_stream_t *p_stream, const es_format_t *p_fmt, static const struct decoder_owner_callbacks dec_cbs = { .spu = { - spu_new_buffer, - decoder_queue_sub, + .buffer_new = spu_new_buffer, + .queue = decoder_queue_sub, }, }; id->p_decoder->cbs = &dec_cbs; diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index 108ea4ec0a..58591859f3 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -155,9 +155,9 @@ int transcode_video_init( sout_stream_t *p_stream, const es_format_t *p_fmt, static const struct decoder_owner_callbacks dec_cbs = { .video = { - video_update_format_decoder, - video_new_buffer_decoder, - decoder_queue_video, + .format_update = video_update_format_decoder, + .buffer_new = video_new_buffer_decoder, + .queue = decoder_queue_video, }, }; id->p_decoder->cbs = &dec_cbs; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
