Andreas Rheinhardt:
> Since commit c5324d92c5f206dcdc2cf93ae237eaa7c1ad0a40 all custom
> interleave_packet() functions always return clean packets (even on
> error), so that unreferencing manually can be removed.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
> ---
> libavformat/mux.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/libavformat/mux.c b/libavformat/mux.c
> index f2de73af9b..c17686c0a6 100644
> --- a/libavformat/mux.c
> +++ b/libavformat/mux.c
> @@ -1075,10 +1075,7 @@ int ff_interleaved_peek(AVFormatContext *s, int stream,
> static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket
> *in, int flush)
> {
> if (s->oformat->interleave_packet) {
> - int ret = s->oformat->interleave_packet(s, out, in, flush);
> - if (in)
> - av_packet_unref(in);
> - return ret;
> + return s->oformat->interleave_packet(s, out, in, flush);
> } else
> return ff_interleave_packet_per_dts(s, out, in, flush);
> }
>
Will apply this tomorrow unless there are objections.
- 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".
