]> git.pld-linux.org Git - packages/performous.git/blob - ffmpeg3.patch
- release 8 (by relup.sh)
[packages/performous.git] / ffmpeg3.patch
1 diff -ur performous-1.0.orig/game/ffmpeg.cc performous-1.0/game/ffmpeg.cc
2 --- performous-1.0.orig/game/ffmpeg.cc  2014-10-29 08:11:45.000000000 +0900
3 +++ performous-1.0/game/ffmpeg.cc       2016-03-30 23:49:22.449629159 +0900
4 @@ -116,7 +116,7 @@
5                 height = cc->height;
6                 m_swsContext = sws_getContext(
7                   cc->width, cc->height, cc->pix_fmt,
8 -                 width, height, PIX_FMT_RGB24,
9 +                 width, height, AV_PIX_FMT_RGB24,
10                   SWS_POINT, nullptr, nullptr, nullptr);
11                 break;
12         default:  // Should never be reached but avoids compile warnings
13 @@ -187,7 +187,7 @@
14                 if (packetSize < 0) throw std::logic_error("negative packet size?!");
15                 if (m_quit || m_seekTarget == m_seekTarget) return;
16                 if (packet.stream_index != m_streamId) return;
17 -               boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free);
18 +               boost::shared_ptr<AVFrame> frame(av_frame_alloc(), &av_free);
19                 int frameFinished = 0;
20                 int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ?
21                   avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) :
22 Only in performous-1.0/game: ffmpeg.cc~
This page took 0.067125 seconds and 3 git commands to generate.