Message ID | 20210318123447.15035-1-ffmpeg@gyani.pro |
---|---|
State | Accepted |
Commit | 75fd3e15190cf72ffcfa15f0fb00f1d9a7ac5b6e |
Headers | show |
Series | [FFmpeg-devel] avformat/rtp_mpegts: typedef MuxChain struct | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
Will apply tomorrow. On 2021-03-18 18:04, Gyan Doshi wrote: > --- > libavformat/rtpenc_mpegts.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c > index 50cebf68a3..28522f8913 100644 > --- a/libavformat/rtpenc_mpegts.c > +++ b/libavformat/rtpenc_mpegts.c > @@ -23,15 +23,15 @@ > #include "avformat.h" > #include "avio_internal.h" > > -struct MuxChain { > +typedef struct MuxChain { > AVFormatContext *mpegts_ctx; > AVFormatContext *rtp_ctx; > AVPacket *pkt; > -}; > +} MuxChain; > > static int rtp_mpegts_write_close(AVFormatContext *s) > { > - struct MuxChain *chain = s->priv_data; > + MuxChain *chain = s->priv_data; > > if (chain->mpegts_ctx) { > av_write_trailer(chain->mpegts_ctx); > @@ -50,7 +50,7 @@ static int rtp_mpegts_write_close(AVFormatContext *s) > > static int rtp_mpegts_write_header(AVFormatContext *s) > { > - struct MuxChain *chain = s->priv_data; > + MuxChain *chain = s->priv_data; > AVFormatContext *mpegts_ctx = NULL, *rtp_ctx = NULL; > ff_const59 AVOutputFormat *mpegts_format = av_guess_format("mpegts", NULL, NULL); > ff_const59 AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); > @@ -120,7 +120,7 @@ fail: > > static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) > { > - struct MuxChain *chain = s->priv_data; > + MuxChain *chain = s->priv_data; > int ret = 0, size; > uint8_t *buf; > AVPacket *local_pkt = chain->pkt; > @@ -158,7 +158,7 @@ static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) > AVOutputFormat ff_rtp_mpegts_muxer = { > .name = "rtp_mpegts", > .long_name = NULL_IF_CONFIG_SMALL("RTP/mpegts output format"), > - .priv_data_size = sizeof(struct MuxChain), > + .priv_data_size = sizeof(MuxChain), > .audio_codec = AV_CODEC_ID_AAC, > .video_codec = AV_CODEC_ID_MPEG4, > .write_header = rtp_mpegts_write_header,
Pushed as 75fd3e15190cf72ffcfa15f0fb00f1d9a7ac5b6e On 2021-03-20 19:28, Gyan Doshi wrote: > Will apply tomorrow. > > On 2021-03-18 18:04, Gyan Doshi wrote: >> --- >> libavformat/rtpenc_mpegts.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c >> index 50cebf68a3..28522f8913 100644 >> --- a/libavformat/rtpenc_mpegts.c >> +++ b/libavformat/rtpenc_mpegts.c >> @@ -23,15 +23,15 @@ >> #include "avformat.h" >> #include "avio_internal.h" >> -struct MuxChain { >> +typedef struct MuxChain { >> AVFormatContext *mpegts_ctx; >> AVFormatContext *rtp_ctx; >> AVPacket *pkt; >> -}; >> +} MuxChain; >> static int rtp_mpegts_write_close(AVFormatContext *s) >> { >> - struct MuxChain *chain = s->priv_data; >> + MuxChain *chain = s->priv_data; >> if (chain->mpegts_ctx) { >> av_write_trailer(chain->mpegts_ctx); >> @@ -50,7 +50,7 @@ static int rtp_mpegts_write_close(AVFormatContext *s) >> static int rtp_mpegts_write_header(AVFormatContext *s) >> { >> - struct MuxChain *chain = s->priv_data; >> + MuxChain *chain = s->priv_data; >> AVFormatContext *mpegts_ctx = NULL, *rtp_ctx = NULL; >> ff_const59 AVOutputFormat *mpegts_format = >> av_guess_format("mpegts", NULL, NULL); >> ff_const59 AVOutputFormat *rtp_format = >> av_guess_format("rtp", NULL, NULL); >> @@ -120,7 +120,7 @@ fail: >> static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket >> *pkt) >> { >> - struct MuxChain *chain = s->priv_data; >> + MuxChain *chain = s->priv_data; >> int ret = 0, size; >> uint8_t *buf; >> AVPacket *local_pkt = chain->pkt; >> @@ -158,7 +158,7 @@ static int >> rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) >> AVOutputFormat ff_rtp_mpegts_muxer = { >> .name = "rtp_mpegts", >> .long_name = NULL_IF_CONFIG_SMALL("RTP/mpegts output >> format"), >> - .priv_data_size = sizeof(struct MuxChain), >> + .priv_data_size = sizeof(MuxChain), >> .audio_codec = AV_CODEC_ID_AAC, >> .video_codec = AV_CODEC_ID_MPEG4, >> .write_header = rtp_mpegts_write_header, > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 50cebf68a3..28522f8913 100644 --- a/libavformat/rtpenc_mpegts.c +++ b/libavformat/rtpenc_mpegts.c @@ -23,15 +23,15 @@ #include "avformat.h" #include "avio_internal.h" -struct MuxChain { +typedef struct MuxChain { AVFormatContext *mpegts_ctx; AVFormatContext *rtp_ctx; AVPacket *pkt; -}; +} MuxChain; static int rtp_mpegts_write_close(AVFormatContext *s) { - struct MuxChain *chain = s->priv_data; + MuxChain *chain = s->priv_data; if (chain->mpegts_ctx) { av_write_trailer(chain->mpegts_ctx); @@ -50,7 +50,7 @@ static int rtp_mpegts_write_close(AVFormatContext *s) static int rtp_mpegts_write_header(AVFormatContext *s) { - struct MuxChain *chain = s->priv_data; + MuxChain *chain = s->priv_data; AVFormatContext *mpegts_ctx = NULL, *rtp_ctx = NULL; ff_const59 AVOutputFormat *mpegts_format = av_guess_format("mpegts", NULL, NULL); ff_const59 AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); @@ -120,7 +120,7 @@ fail: static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) { - struct MuxChain *chain = s->priv_data; + MuxChain *chain = s->priv_data; int ret = 0, size; uint8_t *buf; AVPacket *local_pkt = chain->pkt; @@ -158,7 +158,7 @@ static int rtp_mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_rtp_mpegts_muxer = { .name = "rtp_mpegts", .long_name = NULL_IF_CONFIG_SMALL("RTP/mpegts output format"), - .priv_data_size = sizeof(struct MuxChain), + .priv_data_size = sizeof(MuxChain), .audio_codec = AV_CODEC_ID_AAC, .video_codec = AV_CODEC_ID_MPEG4, .write_header = rtp_mpegts_write_header,