upstream patched

3 files changed, 6 insertions, 203 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 089a8e2ad801..5f8a8c643ad0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bomi-git
 	pkgdesc = Powerful and easy-to-use GUI multimedia player based on mpv (git version)
-	pkgver = 0.9.11.r37.g2d2a3515
-	pkgrel = 3
+	pkgver = 0.9.11.r39.g5f0cc0a7
+	pkgrel = 1
 	url = http://bomi-player.github.io
 	arch = i686
 	arch = x86_64
@@ -43,10 +43,8 @@ pkgbase = bomi-git
 	conflicts = bomi
 	source = git+https://github.com/d-s-x/bomi.git
 	source = add_sup_subext.patch
-	source = fix_compilation_error_from_ffmpeg_change.patch
 	md5sums = SKIP
 	md5sums = dacb0df199eea0f6e3d5c037c8c5429d
-	md5sums = 2a34f03dcb17b98a63cbb3e4e1379b4d
 
 pkgname = bomi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 77e6b20ea0b1..70b2453548b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 _pkgbase=bomi
 
 pkgname=$_pkgbase-git
-pkgver=0.9.11.r37.g2d2a3515
-pkgrel=3
+pkgver=0.9.11.r39.g5f0cc0a7
+pkgrel=1
 pkgdesc="Powerful and easy-to-use GUI multimedia player based on mpv (git version)"
 arch=('i686' 'x86_64')
 url="http://bomi-player.github.io"
@@ -26,11 +26,9 @@ optdepends=('libva-intel-driver: hardware acceleration support for Intel GPU'
 provides=('bomi')
 conflicts=('cmplayer' 'bomi')
 source=(git+https://github.com/d-s-x/${_pkgbase}.git
-        add_sup_subext.patch
-        fix_compilation_error_from_ffmpeg_change.patch)
+        add_sup_subext.patch)
 md5sums=('SKIP'
-         'dacb0df199eea0f6e3d5c037c8c5429d'
-         '2a34f03dcb17b98a63cbb3e4e1379b4d')
+         'dacb0df199eea0f6e3d5c037c8c5429d')
 #options=(debug !strip)
 
 pkgver() {
@@ -42,7 +40,6 @@ prepare() {
     cd "$srcdir/$_pkgbase"
 
     patch -Np1 -i $srcdir/add_sup_subext.patch
-    patch -Np1 -i $srcdir/fix_compilation_error_from_ffmpeg_change.patch
 
     ./configure --prefix=/usr
 }
diff --git a/fix_compilation_error_from_ffmpeg_change.patch b/fix_compilation_error_from_ffmpeg_change.patch
deleted file mode 100644
index 26c40c6d1fcf..000000000000
--- a/fix_compilation_error_from_ffmpeg_change.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41..5365525c 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index 16ff8c16..33fe1ec7 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -155,8 +155,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c69470..fb6206bc 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee3..9c97c97a 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8..6f438249 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0..62cd90ef 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350..2589faf4 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7..895e0952 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)