svn commit: r426348 - head/multimedia/miro/files

[Jan Beich]

Author: jbeich
Date: Fri Nov 18 23:39:38 2016
New Revision: 426348
URL: https://svnweb.freebsd.org/changeset/ports/426348

Log:
  multimedia/miro: unbreak build with ffmpeg 3.x
  
  linux/miro-segmenter.c:81:92: error: use of
        undeclared identifier 'CODEC_ID_MP3'; did you mean 'AV_CODEC_ID_MP3'?
    ...== 1 && input_codec_context->codec_id == CODEC_ID_MP3) || input_codec_context->codec_id == CO...
                                                ^~~~~~~~~~~~
                                                AV_CODEC_ID_MP3
  /usr/local/include/libavcodec/avcodec.h:517:5: note: 'AV_CODEC_ID_MP3' declared here
      AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
      ^
  linux/miro-segmenter.c:81:142: error: use of
        undeclared identifier 'CODEC_ID_AC3'; did you mean 'AV_CODEC_ID_AC3'?
    ...== CODEC_ID_MP3) || input_codec_context->codec_id == CODEC_ID_AC3) {
                                                            ^~~~~~~~~~~~
                                                            AV_CODEC_ID_AC3
  /usr/local/include/libavcodec/avcodec.h:519:5: note: 'AV_CODEC_ID_AC3' declared here
      AV_CODEC_ID_AC3,
      ^
  
  PR:		214195
  Approved by:	portmgr blanket

Modified:
  head/multimedia/miro/files/patch-linux_miro-segmenter.c   (contents, props changed)

Modified: head/multimedia/miro/files/patch-linux_miro-segmenter.c
==============================================================================
--- head/multimedia/miro/files/patch-linux_miro-segmenter.c	Fri Nov 18 22:01:35 2016	(r426347)
+++ head/multimedia/miro/files/patch-linux_miro-segmenter.c	Fri Nov 18 23:39:38 2016	(r426348)
@@ -1,5 +1,5 @@
---- linux/miro-segmenter.c.orig	2012-01-15 13:57:34.494670887 +0100
-+++ linux/miro-segmenter.c	2012-01-15 13:57:40.513497721 +0100
+--- linux/miro-segmenter.c.orig	2013-04-05 16:02:42 UTC
++++ linux/miro-segmenter.c
 @@ -25,6 +25,10 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -11,3 +11,15 @@
  #include <arpa/inet.h>
  
  #include <errno.h>
+@@ -74,7 +78,11 @@ static AVStream *add_output_stream(AVFor
+             output_codec_context->sample_rate = input_codec_context->sample_rate;
+             output_codec_context->channels = input_codec_context->channels;
+             output_codec_context->frame_size = input_codec_context->frame_size;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
+             if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == CODEC_ID_MP3) || input_codec_context->codec_id == CODEC_ID_AC3) {
++#else
++            if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == AV_CODEC_ID_MP3) || input_codec_context->codec_id == AV_CODEC_ID_AC3) {
++#endif
+                 output_codec_context->block_align = 0;
+             }
+             else {