[FFmpeg-devel] [PATCH 08/25] avformat/utils: Remove always-false check

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Mon Aug 30 17:15:05 EEST 2021


Andreas Rheinhardt:
> AVFormatContext.internal is already allocated by
> avformat_alloc_context() on success; and on error,
> avformat_alloc_context() cleans up manually without
> avformat_free_context().
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavformat/utils.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index 4caa3017fb..7d7fd16257 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -1742,8 +1742,6 @@ return_packet:
>  /* XXX: suppress the packet queue */
>  static void flush_packet_queue(AVFormatContext *s)
>  {
> -    if (!s->internal)
> -        return;
>      avpriv_packet_list_free(&s->internal->parse_queue,       &s->internal->parse_queue_end);
>      avpriv_packet_list_free(&s->internal->packet_buffer,     &s->internal->packet_buffer_end);
>      avpriv_packet_list_free(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end);
> 
Will apply patches 8-17 (with the reference to FFStream removed from the
commit message of #14) tomorrow unless there are objections.

- Andreas


More information about the ffmpeg-devel mailing list