diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-04-30 19:28:30 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-04-30 19:28:30 +0000 |
| commit | e1ccc985839487d242cdbf0579d62894ba6c7953 (patch) | |
| tree | 2e3ad4f4735ea0866f5f5a84d44670a430bc5a8b /net/freerdp | |
| parent | 363b335f0baac375ce94ab4a48b44ee10230cc3f (diff) | |
| download | freebsd-ports-e1ccc985839487d242cdbf0579d62894ba6c7953.zip | |
net/freerdp: drop bogus ffmpeg fix
av_frame_free() replaced avcodec_free_frame() according to
ffmpeg-3.0/doc/APIchanges.
Obtained from: upstream
Diffstat (limited to 'net/freerdp')
| -rw-r--r-- | net/freerdp/Makefile | 2 | ||||
| -rw-r--r-- | net/freerdp/files/patch-ffmpeg29 | 38 |
2 files changed, 1 insertions, 39 deletions
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 751b7cf9db2b..e7eeecc19d24 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -3,7 +3,7 @@ PORTNAME= freerdp DISTVERSION= 2.0.0-rc1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net comms ipv6 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/net/freerdp/files/patch-ffmpeg29 b/net/freerdp/files/patch-ffmpeg29 deleted file mode 100644 index 653fdefcbf08..000000000000 --- a/net/freerdp/files/patch-ffmpeg29 +++ /dev/null @@ -1,38 +0,0 @@ ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2016-10-21 07:29:51 UTC -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -346,7 +346,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITS - av_picture_copy((AVPicture*) frame, (AVPicture*) mdecoder->frame, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); -- av_free(frame); -+ av_frame_free(&frame); - } - - return ret; -@@ -428,7 +428,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITS - decoded_frame->nb_samples, mdecoder->codec_context->sample_fmt, 1); - memcpy(dst, decoded_frame->data[0], frame_size); - } -- av_free(decoded_frame); -+ av_frame_free(&decoded_frame); - } - #endif - if (len <= 0 || frame_size <= 0) -@@ -524,7 +524,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode - { - TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; - if (mdecoder->frame) -- av_free(mdecoder->frame); -+ av_frame_free(&mdecoder->frame); - - free(mdecoder->decoded_data); - -@@ -534,7 +534,7 @@ static void tsmf_ffmpeg_free(ITSMFDecode - avcodec_close(mdecoder->codec_context); - - free(mdecoder->codec_context->extradata); -- av_free(mdecoder->codec_context); -+ av_frame_free(&mdecoder->codec_context); - } - free(decoder); - } |