diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-09-15 15:04:41 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-09-15 15:04:49 +0200 |
| commit | 29a24ecb42f70d12c62be37364a1ca5cacb7da6b (patch) | |
| tree | 730d851cd512e3b5a766b50d2a4a01579d895021 /media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch | |
| parent | media-libs/xine-lib: fix build with ffmpeg git master (diff) | |
| download | gentoo-29a24ecb42f70d12c62be37364a1ca5cacb7da6b.tar.gz gentoo-29a24ecb42f70d12c62be37364a1ca5cacb7da6b.tar.bz2 gentoo-29a24ecb42f70d12c62be37364a1ca5cacb7da6b.zip | |
media-video/mplayer: backport upstream patch to build against ffmpeg git master
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch')
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch new file mode 100644 index 000000000000..e101ee769ec7 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch @@ -0,0 +1,25 @@ +r37450 | rtogni | 2015-08-17 23:17:16 +0200 (Mon, 17 Aug 2015) | 3 lines + +Stop using deprecatet AVPacket.destruct + +Index: libmpdemux/demux_lavf.c +=================================================================== +--- libmpdemux/demux_lavf.c (revision 37449) ++++ libmpdemux/demux_lavf.c (revision 37450) +@@ -682,16 +682,9 @@ + return 1; + } + +- if(pkt.destruct == av_destruct_packet && !CONFIG_MEMALIGN_HACK){ +- dp=new_demux_packet(0); +- dp->len=pkt.size; +- dp->buffer=pkt.data; +- pkt.destruct= NULL; +- }else{ + dp=new_demux_packet(pkt.size); + memcpy(dp->buffer, pkt.data, pkt.size); + av_free_packet(&pkt); +- } + + if(pkt.pts != AV_NOPTS_VALUE){ + dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); |