diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2017-06-17 11:56:39 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2017-06-17 11:57:00 +0200 |
| commit | ec329317cce1415d6cfb7211ebc343a7b74f56b0 (patch) | |
| tree | 0c2e20933ca59ec4ebea18c2c7072e72bbb90123 /games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch | |
| parent | package.mask: Mask app-emulation/vmware-{workstation,player,modules,tools} (diff) | |
| download | gentoo-ec329317cce1415d6cfb7211ebc343a7b74f56b0.tar.gz gentoo-ec329317cce1415d6cfb7211ebc343a7b74f56b0.tar.bz2 gentoo-ec329317cce1415d6cfb7211ebc343a7b74f56b0.zip | |
games-emulation/pcsxr: Fix compatibility with ffmpeg-3 (#602396 by shinydoofy)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch')
| -rw-r--r-- | games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch new file mode 100644 index 000000000000..345ed9993ea4 --- /dev/null +++ b/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch @@ -0,0 +1,62 @@ +--- a/libpcsxcore/cdriso.c 2013-11-09 16:24:14.000000000 +0100 ++++ b/libpcsxcore/cdriso.c 2016-12-12 01:02:25.652521029 +0100 +@@ -266,14 +266,14 @@ + } + + if (!decoded_frame) { +- if (!(decoded_frame = avcodec_alloc_frame())) { ++ if (!(decoded_frame = av_frame_alloc())) { + SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available.")); + avformat_close_input(&inAudioFormat); +- avcodec_free_frame(&decoded_frame); ++ av_frame_free(&decoded_frame); + return 1; // error decoding frame + } + } else { +- avcodec_get_frame_defaults(decoded_frame); ++ av_frame_unref(decoded_frame); + } + len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); + if (len > 0 && got_frame) { +@@ -285,7 +285,7 @@ + fwrite(decoded_frame->data[0], 1, data_size, outfile); + } + av_free_packet(&avpkt); +- //avcodec_free_frame(&decoded_frame); ++ //av_frame_free(&decoded_frame); + } while (moreFrames >= 0); // TODO: check for possible leaks + + // file will be closed later on, now just flush it +@@ -294,7 +294,7 @@ + avformat_close_input(&inAudioFormat); + //avcodec_close(c); + //av_free(c); +- avcodec_free_frame(&decoded_frame); ++ av_frame_free(&decoded_frame); + return 0; + } + #endif +@@ -340,12 +340,12 @@ + while (avpkt.size > 0) { + int got_frame = 0; + if (!decoded_frame) { +- if (!(decoded_frame = avcodec_alloc_frame())) { ++ if (!(decoded_frame = av_frame_alloc())) { + SysPrintf(" -> Error allocating audio frame buffer. Track will not be available."); + return 1; // error decoding frame + } + } else { +- avcodec_get_frame_defaults(decoded_frame); ++ av_frame_unref(decoded_frame); + } + + len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); +@@ -383,7 +383,7 @@ + + avcodec_close(c); + av_free(c); +- avcodec_free_frame(&decoded_frame); ++ av_frame_free(&decoded_frame); + return 0; + } + #endif |