Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/gmic/files: gmic-1.5.8.2-ffmpeg.patch
Date: Mon, 27 Jan 2014 02:51:10
Message-Id: 20140127025107.6AF612004E@flycatcher.gentoo.org
1 radhermit 14/01/27 02:51:07
2
3 Added: gmic-1.5.8.2-ffmpeg.patch
4 Log:
5 Version bump. Drop doc use flag, online reference manual should be used or downloaded instead.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch?rev=1.1&content-type=text/plain
14
15 Index: gmic-1.5.8.2-ffmpeg.patch
16 ===================================================================
17 --- gmic-1.5.8.2/src/CImg.h
18 +++ gmic-1.5.8.2/src/CImg.h
19 @@ -319,6 +319,7 @@
20 extern "C" {
21 #include <libavformat/avformat.h>
22 #include <libavcodec/avcodec.h>
23 +#include <libavutil/mathematics.h>
24 #include <libswscale/swscale.h>
25 }
26 #endif
27 @@ -45789,7 +45790,11 @@
28 AVPacket pkt;
29 int got_packet;
30 av_init_packet(&pkt);
31 +#if LIBAVCODEC_VERSION_INT<AV_VERSION_INT(54,1,0)
32 + out_size = avcodec_encode_video(c,video_outbuf,video_outbuf_size,picture);
33 +#else
34 out_size = avcodec_encode_video2(c,&pkt,picture,&got_packet);
35 +#endif
36 if (got_packet) {
37 pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
38 if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;