svn commit: r468863 - in head/multimedia: zoneminder-h264/files zoneminder/files

[Jan Beich]

Author: jbeich
Date: Wed May  2 18:34:15 2018
New Revision: 468863
URL: https://svnweb.freebsd.org/changeset/ports/468863

Log:
  multimedia/zoneminder: AVFMT_RAWPICTURE is part of libavformat

Modified:
  head/multimedia/zoneminder-h264/files/patch-ffmpeg4   (contents, props changed)
  head/multimedia/zoneminder/files/patch-ffmpeg4   (contents, props changed)

Modified: head/multimedia/zoneminder-h264/files/patch-ffmpeg4
==============================================================================
--- head/multimedia/zoneminder-h264/files/patch-ffmpeg4	Wed May  2 18:30:13 2018	(r468862)
+++ head/multimedia/zoneminder-h264/files/patch-ffmpeg4	Wed May  2 18:34:15 2018	(r468863)
@@ -30,7 +30,7 @@ Partially based on https://github.com/ZoneMinder/zonem
    }
  
    video_outbuf = NULL;
-+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
    if ( !(of->flags & AVFMT_RAWPICTURE) )
 +#endif
    {
@@ -40,7 +40,7 @@ Partially based on https://github.com/ZoneMinder/zonem
    AVPacket *pkt = packet_buffers[packet_index];
    av_init_packet( pkt );
    int got_packet = 0;
-+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
    if ( of->flags & AVFMT_RAWPICTURE )
    {
  #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
@@ -108,7 +108,7 @@ Partially based on https://github.com/ZoneMinder/zonem
  
    /*opkt.flags |= AV_PKT_FLAG_KEY;*/
  
-+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
    if (video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (fmt->flags & AVFMT_RAWPICTURE)) {
      /* store AVPicture in AVPacket, as expected by the output format */
      avpicture_fill(&pict, opkt.data, video_st->codec->pix_fmt, video_st->codec->width, video_st->codec->height);

Modified: head/multimedia/zoneminder/files/patch-ffmpeg4
==============================================================================
--- head/multimedia/zoneminder/files/patch-ffmpeg4	Wed May  2 18:30:13 2018	(r468862)
+++ head/multimedia/zoneminder/files/patch-ffmpeg4	Wed May  2 18:34:15 2018	(r468863)
@@ -30,7 +30,7 @@ Partially based on https://github.com/ZoneMinder/zonem
    }
  
    video_outbuf = NULL;
-+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
    if ( !(of->flags & AVFMT_RAWPICTURE) )
 +#endif
    {
@@ -40,7 +40,7 @@ Partially based on https://github.com/ZoneMinder/zonem
    AVPacket *pkt = packet_buffers[packet_index];
    av_init_packet( pkt );
    int got_packet = 0;
-+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
    if ( of->flags & AVFMT_RAWPICTURE )
    {
  #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)