From 0a9c02b1ad22937e820a1284acfa6d78e9f5e2f7 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 29 Mar 2022 22:31:39 +0200 Subject: [PATCH] Always set sys->packet --- libfreerdp/codec/h264_ffmpeg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libfreerdp/codec/h264_ffmpeg.c b/libfreerdp/codec/h264_ffmpeg.c index bb0f3d0c2..b29725232 100644 --- a/libfreerdp/codec/h264_ffmpeg.c +++ b/libfreerdp/codec/h264_ffmpeg.c @@ -201,6 +201,7 @@ static int libavcodec_decompress(H264_CONTEXT* h264, const BYTE* pSrcData, UINT3 WINPR_ASSERT(sys); #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 133, 100) + sys->packet = &sys->bufferpacket; WINPR_ASSERT(sys->packet); av_init_packet(sys->packet); #else @@ -324,6 +325,7 @@ static int libavcodec_compress(H264_CONTEXT* h264, const BYTE** pSrcYuv, const U return -1; #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 39, 100) + sys->packet = &sys->bufferpacket; WINPR_ASSERT(sys->packet); av_packet_unref(sys->packet); #else @@ -554,10 +556,6 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) goto EXCEPTION; } -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 133, 100) - sys->packet = &sys->bufferpacket; -#endif - h264->pSystemData = (void*)sys; #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)