<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145934] trunk/dports/graphics/gegl/files/patch-ffmpeg.diff</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145934">145934</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-21 09:31:44 -0800 (Sun, 21 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gegl: update ffmpeg patch for compatibility with ffmpeg 3.0, no need to increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsgeglfilespatchffmpegdiff">trunk/dports/graphics/gegl/files/patch-ffmpeg.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsgeglfilespatchffmpegdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gegl/files/patch-ffmpeg.diff (145933 => 145934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gegl/files/patch-ffmpeg.diff 2016-02-21 16:41:06 UTC (rev 145933)
+++ trunk/dports/graphics/gegl/files/patch-ffmpeg.diff 2016-02-21 17:31:44 UTC (rev 145934)
</span><span class="lines">@@ -131,3 +131,78 @@
</span><span class="cx"> if (!st)
</span><span class="cx"> {
</span><span class="cx"> fprintf (stderr, "Could not alloc stream %p %p %i\n", op, oc, codec_id);
</span><ins>+--- operations/workshop/external/ff-save.c.orig 2016-02-21 07:46:59.000000000 -0800
++++ operations/workshop/external/ff-save.c 2016-02-21 07:51:06.000000000 -0800
+@@ -410,10 +410,10 @@
+ p->audio_input_frame_size = p->audio_outbuf_size / c->channels;
+ switch (st->codec->codec_id)
+ {
+- case CODEC_ID_PCM_S16LE:
+- case CODEC_ID_PCM_S16BE:
+- case CODEC_ID_PCM_U16LE:
+- case CODEC_ID_PCM_U16BE:
++ case AV_CODEC_ID_PCM_S16LE:
++ case AV_CODEC_ID_PCM_S16BE:
++ case AV_CODEC_ID_PCM_U16LE:
++ case AV_CODEC_ID_PCM_U16BE:
+ p->audio_input_frame_size >>= 1;
+ break;
+ default:
+@@ -513,11 +513,11 @@
+ c->frame_rate=op->fps;
+ c->frame_rate_base=1;
+ #endif
+- c->pix_fmt = PIX_FMT_YUV420P;
++ c->pix_fmt = AV_PIX_FMT_YUV420P;
+
+
+ c->gop_size = 12; /* emit one intra frame every twelve frames at most */
+- if (c->codec_id == CODEC_ID_MPEG2VIDEO)
++ if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO)
+ {
+ /* just for testing, we also add B frames */
+ /*c->max_b_frames = 2;*/
+@@ -595,9 +595,9 @@
+ picture is needed too. It is then converted to the required
+ output format */
+ p->tmp_picture = NULL;
+- if (c->pix_fmt != PIX_FMT_RGB24)
++ if (c->pix_fmt != AV_PIX_FMT_RGB24)
+ {
+- p->tmp_picture = alloc_picture (PIX_FMT_RGB24, c->width, c->height);
++ p->tmp_picture = alloc_picture (AV_PIX_FMT_RGB24, c->width, c->height);
+ if (!p->tmp_picture)
+ {
+ fprintf (stderr, "Could not allocate temporary picture\n");
+@@ -648,7 +648,7 @@
+
+ c = st->codec;
+
+- if (c->pix_fmt != PIX_FMT_RGB24)
++ if (c->pix_fmt != AV_PIX_FMT_RGB24)
+ {
+ struct SwsContext *img_convert_ctx;
+
+@@ -658,7 +658,7 @@
+ c->height);
+
+ img_convert_ctx = sws_getContext(c->width, c->height, c->pix_fmt,
+- c->width, c->height, PIX_FMT_RGB24,
++ c->width, c->height, AV_PIX_FMT_RGB24,
+ SWS_BICUBIC, NULL, NULL, NULL);
+
+ if (img_convert_ctx == NULL)
+@@ -760,11 +760,11 @@
+ p->video_st = NULL;
+ p->audio_st = NULL;
+
+- if (p->fmt->video_codec != CODEC_ID_NONE)
++ if (p->fmt->video_codec != AV_CODEC_ID_NONE)
+ {
+ p->video_st = add_video_stream (self, p->oc, p->fmt->video_codec);
+ }
+- if (p->oxide_audio_query && p->fmt->audio_codec != CODEC_ID_NONE)
++ if (p->oxide_audio_query && p->fmt->audio_codec != AV_CODEC_ID_NONE)
+ {
+ /*XXX: FOO p->audio_st = add_audio_stream (op, p->oc, p->fmt->audio_codec);*/
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>