moonlight-stream/moonlight-embedded
1
0 Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-10-25 13:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid deprecated av_init_packet() function

Browse Source
This commit is contained in:
Cameron Gutman committed 2021-07-25 13:17:21 -05:00
1 parent 48de7760dc
commit 8602c85714
1 file changed
+10 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/video/ffmpeg.c
+10 -5
View File
@@ -32,7 +32,7 @@
#include <stdbool.h> #include <stdbool.h>
// General decoder and renderer state // General decoder and renderer state
static AVPacket pkt; static AVPacket* pkt;
static AVCodec* decoder; static AVCodec* decoder;
static AVCodecContext* decoder_ctx; static AVCodecContext* decoder_ctx;
static AVFrame** dec_frames; static AVFrame** dec_frames;
@@ -53,7 +53,11 @@ int ffmpeg_init(int videoFormat, int width, int height, int perf_lvl, int buffer
avcodec_register_all(); avcodec_register_all();
#endif #endif
av_init_packet(&pkt); pkt = av_packet_alloc();
if (pkt == NULL) {
printf("Couldn't allocate packet\n");
return -1;
}
ffmpeg_decoder = perf_lvl & VAAPI_ACCELERATION ? VAAPI : SOFTWARE; ffmpeg_decoder = perf_lvl & VAAPI_ACCELERATION ? VAAPI : SOFTWARE;
switch (videoFormat) { switch (videoFormat) {
@@ -127,6 +131,7 @@ int ffmpeg_init(int videoFormat, int width, int height, int perf_lvl, int buffer
// This function must be called after // This function must be called after
// decoding is finished // decoding is finished
void ffmpeg_destroy(void) { void ffmpeg_destroy(void) {
av_packet_free(&pkt);
if (decoder_ctx) { if (decoder_ctx) {
avcodec_close(decoder_ctx); avcodec_close(decoder_ctx);
av_free(decoder_ctx); av_free(decoder_ctx);
@@ -161,10 +166,10 @@ AVFrame* ffmpeg_get_frame(bool native_frame) {
int ffmpeg_decode(unsigned char* indata, int inlen) { int ffmpeg_decode(unsigned char* indata, int inlen) {
int err; int err;
pkt.data = indata; pkt->data = indata;
pkt.size = inlen; pkt->size = inlen;
err = avcodec_send_packet(decoder_ctx, &pkt); err = avcodec_send_packet(decoder_ctx, pkt);
if (err < 0) { if (err < 0) {
char errorstring[512]; char errorstring[512];
av_strerror(err, errorstring, sizeof(errorstring)); av_strerror(err, errorstring, sizeof(errorstring));