From cae711525387a9d3525c3d20e41a694aedde7c3e Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Mon, 5 Jun 2017 16:57:12 -0400
Subject: [PATCH] video: call av_packet_unref instead of av_free_packet
av_free_packet has been deprecated in newer FFmpeg versions
Change-Id: I7bc6f36575890262e8138cc78189ecae2d2b032e
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
src/media/media_encoder.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index aa0676ec93..9c6859a164 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -296,8 +296,7 @@ MediaEncoder::encode(VideoFrame& input, bool is_keyframe,
if (is_keyframe) {
frame->pict_type = AV_PICTURE_TYPE_I;
} else {
- /* FIXME: Should be AV_PICTURE_TYPE_NONE for newer libavutil */
- frame->pict_type = (AVPictureType) 0;
+ frame->pict_type = AV_PICTURE_TYPE_NONE;
}
AVPacket pkt;
@@ -335,7 +334,7 @@ MediaEncoder::encode(VideoFrame& input, bool is_keyframe,
}
}
- av_free_packet(&pkt);
+ av_packet_unref(&pkt);
return ret;
}
@@ -441,7 +440,7 @@ int MediaEncoder::encode_audio(const AudioBuffer &buffer)
}
}
- av_free_packet(&pkt);
+ av_packet_unref(&pkt);
av_frame_free(&frame);
}
@@ -484,7 +483,7 @@ int MediaEncoder::flush()
break;
}
}
- av_free_packet(&pkt);
+ av_packet_unref(&pkt);
return ret;
}
--
GitLab