Marton Balint:
> Signed-off-by: Marton Balint <c...@passwd.hu>
> ---
> libavformat/mux.c | 52 +++++++++++++++++++++-------------------------------
> 1 file changed, 21 insertions(+), 31 deletions(-)
>
> diff --git a/libavformat/mux.c b/libavformat/mux.c
> index 5209c84f40..90faf51768 100644
> --- a/libavformat/mux.c
> +++ b/libavformat/mux.c
> @@ -1195,6 +1195,25 @@ static int interleave_packet(AVFormatContext *s,
> AVPacket *out, AVPacket *in, in
> return ff_interleave_packet_per_dts(s, out, in, flush);
> }
>
> +static int interleaved_write_packet(AVFormatContext *s, AVPacket *pkt, int
> flush)
> +{
> + for (;; ) {
> + AVPacket opkt;
> + int ret = interleave_packet(s, &opkt, pkt, flush);
> + if (ret <= 0)
> + return ret;
> +
> + pkt = NULL;
> +
> + ret = write_packet(s, &opkt);
> +
> + av_packet_unref(&opkt);
> +
> + if (ret < 0)
> + return ret;
> + }
> +}
> +
> int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
> {
> int ret, flush = 0;
> @@ -1229,22 +1248,8 @@ int av_interleaved_write_frame(AVFormatContext *s,
> AVPacket *pkt)
> av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame FLUSH\n");
> flush = 1;
> }
> + return interleaved_write_packet(s, pkt, flush);
>
> - for (;; ) {
> - AVPacket opkt;
> - int ret = interleave_packet(s, &opkt, pkt, flush);
> - if (ret <= 0)
> - return ret;
> -
> - pkt = NULL;
> -
> - ret = write_packet(s, &opkt);
> -
> - av_packet_unref(&opkt);
> -
> - if (ret < 0)
> - return ret;
> - }
> fail:
> av_packet_unref(pkt);
> return ret;
> @@ -1254,23 +1259,8 @@ int av_write_trailer(AVFormatContext *s)
> {
> int ret, i;
>
> - for (;; ) {
> - AVPacket pkt;
> - ret = interleave_packet(s, &pkt, NULL, 1);
> - if (ret < 0)
> - goto fail;
> - if (!ret)
> - break;
> -
> - ret = write_packet(s, &pkt);
> -
> - av_packet_unref(&pkt);
> + ret = interleaved_write_packet(s, NULL, 1);
>
> - if (ret < 0)
> - goto fail;
> - }
> -
> -fail:
> if (s->oformat->write_trailer) {
> if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
> avio_write_marker(s->pb, AV_NOPTS_VALUE,
> AVIO_DATA_MARKER_TRAILER);
>
Looks good on its own; yet I wonder about the placement of
interleaved_write_packet(). The current one requires a forward
declaration in the next patch.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
