[145934] trunk/dports/graphics/gegl/files/patch-ffmpeg.diff

[devans at macports.org]

Revision: 145934
          https://trac.macports.org/changeset/145934
Author:   devans at macports.org
Date:     2016-02-21 09:31:44 -0800 (Sun, 21 Feb 2016)
Log Message:
-----------
gegl: update ffmpeg patch for compatibility with ffmpeg 3.0, no need to increment revision.

Modified Paths:
--------------
    trunk/dports/graphics/gegl/files/patch-ffmpeg.diff

Modified: trunk/dports/graphics/gegl/files/patch-ffmpeg.diff
===================================================================
--- 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)
@@ -131,3 +131,78 @@
    if (!st)
      {
        fprintf (stderr, "Could not alloc stream %p %p %i\n", op, oc, codec_id);
+--- 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);*/
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160221/a30ddd31/attachment.html>