tmm1

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a0ac7017dc..5a8f23424e 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2458,6 +2458,10 @@ Window
     support window embedding of foreign processes, this works only with libmpv,
     and will crash when used from the command line.
 
+    On Android, the ID is interpreted as ``android.view.Surface``. Pass it as a
+    value cast to ``intptr_t``. Use with ``--vo=android`` and

tmm1

diff --git a/audio/out/ao_opensles.c b/audio/out/ao_opensles.c
index 5357ab4920..172a543fac 100644
--- a/audio/out/ao_opensles.c
+++ b/audio/out/ao_opensles.c
@@ -49,6 +49,28 @@ static const int fmtmap[][2] = {
     { 0 }
 };
 
+static const int speaker_map[][2] = {
+  {SL_SPEAKER_FRONT_LEFT,              MP_SPEAKER_ID_FL},

tmm1

diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index e6d10928d5..c8131d299d 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -896,8 +896,10 @@ static int vtenc_create_encoder(AVCodecContext   *avctx,
                                 VTCompressionSessionRef *session)
 {
     VTEncContext *vtctx = avctx->priv_data;
+    double       frame_rate = av_q2d(avctx->framerate);
     SInt32       bit_rate = avctx->bit_rate;

tmm1

diff --git a/demux/demux.c b/demux/demux.c
index 0c45083e2d..61e45be90b 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -268,6 +268,7 @@ struct sh_stream *demux_alloc_sh_stream(enum stream_type type)
         .index = -1,
         .ff_index = -1,     // may be overwritten by demuxer
         .demuxer_id = -1,   // ... same
+        .program_num = -1,  // ...
         .codec = talloc_zero(sh, struct mp_codec_params),

tmm1

diff --git a/libavfilter/aarch64/Makefile b/libavfilter/aarch64/Makefile
new file mode 100644
index 0000000..5d6f6d3
--- /dev/null
+++ b/libavfilter/aarch64/Makefile
@@ -0,0 +1,3 @@
+OBJS-$(CONFIG_YADIF_FILTER)      += aarch64/vf_yadif_init.o
+
+NEON-OBJS-$(CONFIG_YADIF_FILTER) += aarch64/vf_yadif.o
diff --git a/libavfilter/aarch64/vf_yadif_init.c b/libavfilter/aarch64/vf_yadif_init.c

tmm1

diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 92ea8bd..490c718 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -660,40 +660,61 @@ static void decode(struct dec_video *vd, struct demux_packet *packet,
         }
         return;
     }
 
     if (ctx->hwdec && ctx->hwdec_failed) {

tmm1

From: Aman <[email protected]>
Date:   Fri Aug 10 16:02:07 2012 +0200
Subject: add AVPlayer audio output module

---
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c2a1462..3070c02 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -453,7 +453,6 @@ speex_resampler

tmm1

From: Aman <[email protected]>
Date:   Fri Aug 10 16:02:07 2012 +0200
Subject: enable ac3 passthru in audiounit_ios

---
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c2a1462..3070c02 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -453,7 +453,6 @@ speex_resampler

tmm1

diff --git a/web/news.txt b/web/news.txt
index beb9819..bc54c43 100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -3,7 +3,7 @@ News
 ====
 
 ..
-  2015-09-14 Version 0.11.4 released
+  2015-xx-xx Version 0.11.4 released

tmm1