summaryrefslogtreecommitdiff
path: root/multimedia/zoneminder-h264/files/patch-ffmpeg4
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2019-01-01 13:52:46 +0000
committerRene Ladan <rene@FreeBSD.org>2019-01-01 13:52:46 +0000
commitba09f7ee95cee49a75d1ecb50f4be68f99de394a (patch)
treef7075798a9a1abe4f41bfb7a9ae6bd8387a1e92a /multimedia/zoneminder-h264/files/patch-ffmpeg4
parentsysutils/policykit-qt, sysutils/qzeitgeist: remove dead variable USE_KDE (diff)
Remove expired ports:
2018-12-30 textproc/pecl-xdiff: Works only with EOL php 5.6 2019-01-01 www/mod_http2-devel: Use the module that is shipped with Apache 2.4 2019-01-01 www/varnish5: Varnish 5 is Retired 2018-12-30 security/pecl-ssh2-0: Works only with EOL php 5.6 2019-01-01 security/bitwarden-ruby: Expects very specific rubygem versions for new updates. Please follow instructions in git repo. 2018-12-30 devel/pecl-intl: Works only with EOL php 5.6 2018-12-30 devel/pecl-APCu4: Works only with EOL php 5.6 2018-12-30 databases/pecl-memcache: Works only with EOL php 5.6 2018-12-30 databases/pecl-memcached2: Works only with EOL php 5.6 2018-12-30 math/pecl-bitset2: Works only with EOL php 5.6 2019-01-01 multimedia/zoneminder-h264: h264 feature was commited to main branch, please upgrade to www/zoneminder 2019-01-01 lang/php56: Security Support ends on 31 Dec 2018
Notes
Notes: svn path=/head/; revision=488894
Diffstat (limited to 'multimedia/zoneminder-h264/files/patch-ffmpeg4')
-rw-r--r--multimedia/zoneminder-h264/files/patch-ffmpeg4122
1 files changed, 0 insertions, 122 deletions
diff --git a/multimedia/zoneminder-h264/files/patch-ffmpeg4 b/multimedia/zoneminder-h264/files/patch-ffmpeg4
deleted file mode 100644
index 5504569c09a6..000000000000
--- a/multimedia/zoneminder-h264/files/patch-ffmpeg4
+++ /dev/null
@@ -1,122 +0,0 @@
-Partially based on https://github.com/ZoneMinder/zoneminder/commit/e17bcb9178d0
-
---- src/zm_mpeg.cpp.orig 2017-02-21 21:28:53 UTC
-+++ src/zm_mpeg.cpp
-@@ -240,7 +240,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
- {
- // Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
- // This gets rid of artifacts in the beginning of the movie; and well, even quality.
-+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-+ c->flags |= AV_CODEC_FLAG_QSCALE;
-+#else
- c->flags |= CODEC_FLAG_QSCALE;
-+#endif
- c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
- }
- else
-@@ -265,7 +269,11 @@ void VideoStream::SetupCodec( int colours, int subpixe
-
- // some formats want stream headers to be separate
- if ( of->flags & AVFMT_GLOBALHEADER )
-+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
- }
- else
- {
-@@ -425,7 +433,9 @@ void VideoStream::OpenStream( )
- }
-
- video_outbuf = NULL;
-+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
- if ( !(of->flags & AVFMT_RAWPICTURE) )
-+#endif
- {
- /* allocate output buffer */
- /* XXX: API change will be done */
-@@ -672,6 +682,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
- AVPacket *pkt = packet_buffers[packet_index];
- av_init_packet( pkt );
- int got_packet = 0;
-+#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
- if ( of->flags & AVFMT_RAWPICTURE )
- {
- #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
-@@ -685,6 +696,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t
- got_packet = 1;
- }
- else
-+#endif
- {
- opicture_ptr->pts = c->frame_number;
- opicture_ptr->quality = c->global_quality;
---- src/zm_sdp.cpp.orig 2017-02-21 21:28:53 UTC
-+++ src/zm_sdp.cpp
-@@ -483,7 +483,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
- uint8_t *dest =
- (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
- stream->codec->extradata_size +
-+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
-+ AV_INPUT_BUFFER_PADDING_SIZE);
-+#else
- FF_INPUT_BUFFER_PADDING_SIZE);
-+#endif
- if(dest) {
- if(stream->codec->extradata_size) {
- // av_realloc?
-@@ -494,7 +498,11 @@ AVFormatContext *SessionDescriptor::generateFormatCont
- memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
- memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
- memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
-+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
-+ packet_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-+#else
- packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+#endif
-
- stream->codec->extradata= dest;
- stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
---- src/zm_videostore.cpp.orig 2017-02-21 21:28:53 UTC
-+++ src/zm_videostore.cpp
-@@ -113,7 +113,11 @@ VideoStore::VideoStore(const char *filename_in, const
-
- video_st->codec->codec_tag = 0;
- if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-+ video_st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
- video_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
- }
-
- if ( orientation ) {
-@@ -146,7 +150,11 @@ VideoStore::VideoStore(const char *filename_in, const
- }
- audio_st->codec->codec_tag = 0;
- if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-+ audio_st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
- audio_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
- }
- }
- } else {
-@@ -283,6 +291,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt,
-
- /*opkt.flags |= AV_PKT_FLAG_KEY;*/
-
-+#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);
-@@ -290,6 +299,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt,
- opkt.size = sizeof(AVPicture);
- opkt.flags |= AV_PKT_FLAG_KEY;
- }
-+#endif
-
- memcpy(&safepkt, &opkt, sizeof(AVPacket));
-