diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-05-02 18:34:15 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-05-02 18:34:15 +0000 |
| commit | a7e80be8ca243fee8e464f48cf371f815ce228d1 (patch) | |
| tree | 5d91b4857a13190feff9abb21920686c24daa384 /multimedia/zoneminder-h264/files/patch-ffmpeg4 | |
| parent | multimedia/zoneminder{,-h264}: unbreak with ffmpeg 4.0 (diff) | |
multimedia/zoneminder: AVFMT_RAWPICTURE is part of libavformat
Notes
Notes:
svn path=/head/; revision=468863
Diffstat (limited to 'multimedia/zoneminder-h264/files/patch-ffmpeg4')
| -rw-r--r-- | multimedia/zoneminder-h264/files/patch-ffmpeg4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/multimedia/zoneminder-h264/files/patch-ffmpeg4 b/multimedia/zoneminder-h264/files/patch-ffmpeg4 index 6822f34a6728..5504569c09a6 100644 --- a/multimedia/zoneminder-h264/files/patch-ffmpeg4 +++ b/multimedia/zoneminder-h264/files/patch-ffmpeg4 @@ -30,7 +30,7 @@ Partially based on https://github.com/ZoneMinder/zoneminder/commit/e17bcb9178d0 } 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/zoneminder/commit/e17bcb9178d0 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/zoneminder/commit/e17bcb9178d0 /*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); |