--- /dev/fd/5	2018-12-11 06:48:21.768000000 +0100
+++ -	2018-12-11 06:48:21.771561923 +0100
@@ -29,21 +29,21 @@
 CC	libavfilter/avfilter.o
 CC	libavfilter/avfiltergraph.o
 CC	libavfilter/buffersink.o
+CC	libavfilter/buffersrc.o
+CC	libavfilter/drawutils.o
+CC	libavfilter/fifo.o
 /home/mik/src/fate/src/libavfilter/avfilter.c:682:53: warning: passing 'uint8_t *[8]' to parameter of type 'const uint8_t **' (aka 'const unsigned char **') discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]
             av_image_copy(out->data, out->linesize, frame->data, frame->linesize,
                                                     ^~~~~~~~~~~
 /home/mik/src/fate/src/libavutil/imgutils.h:117:35: note: passing argument to parameter 'src_data' here
                    const uint8_t *src_data[4], const int src_linesizes[4],
                                   ^
-CC	libavfilter/buffersrc.o
-CC	libavfilter/drawutils.o
-CC	libavfilter/fifo.o
 CC	libavfilter/formats.o
 CC	libavfilter/graphparser.o
 CC	libavfilter/pthread.o
 CC	libavfilter/setpts.o
-1 warning generated.
 CC	libavfilter/settb.o
+1 warning generated.
 CC	libavfilter/split.o
 CC	libavfilter/trim.o
 CC	libavfilter/vf_aspect.o
@@ -72,7 +72,6 @@
 CC	libavfilter/vf_pad.o
 CC	libavfilter/vf_pixdesctest.o
 CC	libavfilter/vf_scale.o
-CC	libavfilter/vf_select.o
 /home/mik/src/fate/src/libavfilter/vf_pixdesctest.c:92:32: warning: passing 'uint8_t *[8]' to parameter of type 'const uint8_t **' (aka 'const unsigned char **') discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]
                                in->data,
                                ^~~~~~~~
@@ -85,6 +84,7 @@
 /home/mik/src/fate/src/libswscale/swscale.h:207:58: note: passing argument to parameter 'srcSlice' here
 int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
                                                          ^
+CC	libavfilter/vf_select.o
 1 warning generated.
 CC	libavfilter/vf_showinfo.o
 1 warning generated.
@@ -100,6 +100,9 @@
 CC	libavfilter/vsrc_nullsrc.o
 CC	libavfilter/vsrc_testsrc.o
 GEN	libavfilter/libavfilter.pc
+CC	libavformat/4xm.o
+CC	libavformat/a64.o
+CC	libavformat/aacdec.o
 /home/mik/src/fate/src/libavfilter/vsrc_movie.c:160:23: warning: 'refcounted_frames' is deprecated [-Wdeprecated-declarations]
     movie->codec_ctx->refcounted_frames = 1;
                       ^
@@ -119,13 +122,10 @@
 #    define attribute_deprecated __attribute__((deprecated))
                                                 ^
 2 warnings generated.
-CC	libavformat/4xm.o
-CC	libavformat/a64.o
-CC	libavformat/aacdec.o
 CC	libavformat/ac3dec.o
 CC	libavformat/adtsenc.o
-CC	libavformat/aea.o
 CC	libavformat/adxdec.o
+CC	libavformat/aea.o
 CC	libavformat/aiffdec.o
 CC	libavformat/aiffenc.o
 CC	libavformat/allformats.o
@@ -315,12 +315,12 @@
 CC	libavformat/psxstr.o
 CC	libavformat/pva.o
 CC	libavformat/qcp.o
-CC	libavformat/r3d.o
 /home/mik/src/fate/src/libavformat/protocols.c:87:7: warning: assigning to 'const URLProtocol **' (aka 'const struct URLProtocol **') from 'const URLProtocol *const *' (aka 'const struct URLProtocol *const *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     p = p ? p + 1 : url_protocols;
       ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
-CC	libavformat/rawdec.o
+CC	libavformat/r3d.o
 1 warning generated.
+CC	libavformat/rawdec.o
 CC	libavformat/rawenc.o
 CC	libavformat/rawvideodec.o
 CC	libavformat/rdt.o
@@ -338,8 +338,8 @@
 CC	libavformat/rm.o
 CC	libavformat/rmdec.o
 CC	libavformat/rmenc.o
-CC	libavformat/rmsipr.o
 1 warning generated.
+CC	libavformat/rmsipr.o
 CC	libavformat/rpl.o
 CC	libavformat/rso.o
 CC	libavformat/rsodec.o
@@ -354,13 +354,13 @@
 CC	libavformat/rtpdec_amr.o
 CC	libavformat/rtpdec_asf.o
 CC	libavformat/rtpdec_dv.o
+CC	libavformat/rtpdec_g726.o
 /home/mik/src/fate/src/libavformat/rtpdec_asf.c:197:31: warning: passing 'const uint8_t *' (aka 'const unsigned char *') to parameter of type 'unsigned char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
         ffio_init_context(pb, buf, len, 0, NULL, NULL, NULL, NULL);
                               ^~~
 /home/mik/src/fate/src/libavformat/avio_internal.h:30:34: note: passing argument to parameter 'buffer' here
                   unsigned char *buffer,
                                  ^
-CC	libavformat/rtpdec_g726.o
 CC	libavformat/rtpdec_h261.o
 1 warning generated.
 CC	libavformat/rtpdec_h263.o
@@ -379,18 +379,18 @@
 CC	libavformat/rtpdec_qt.o
 CC	libavformat/rtpdec_svq3.o
 CC	libavformat/rtpdec_vp8.o
-CC	libavformat/rtpdec_vp9.o
 /home/mik/src/fate/src/libavformat/rtpdec_qt.c:76:28: warning: passing 'const uint8_t *' (aka 'const unsigned char *') to parameter of type 'unsigned char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     ffio_init_context(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
                            ^~~
 /home/mik/src/fate/src/libavformat/avio_internal.h:30:34: note: passing argument to parameter 'buffer' here
                   unsigned char *buffer,
                                  ^
+CC	libavformat/rtpdec_vp9.o
 CC	libavformat/rtpdec_xiph.o
 CC	libavformat/rtpenc.o
+1 warning generated.
 CC	libavformat/rtpenc_aac.o
 CC	libavformat/rtpenc_amr.o
-1 warning generated.
 CC	libavformat/rtpenc_chain.o
 CC	libavformat/rtpenc_h261.o
 CC	libavformat/rtpenc_h263.o
@@ -554,6 +554,7 @@
 CC	libavcodec/avpicture.o
 CC	libavcodec/avs.o
 CC	libavcodec/bethsoftvideo.o
+CC	libavcodec/bfi.o
 /home/mik/src/fate/src/libavcodec/avpicture.c:49:36: warning: passing 'uint8_t *const[8]' to parameter of type 'const uint8_t *const *' (aka 'const unsigned char *const *') discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]
                                    src->data, src->linesize,
                                    ^~~~~~~~~
@@ -567,15 +568,12 @@
                    const uint8_t *src_data[4], const int src_linesizes[4],
                                   ^
 2 warnings generated.
-CC	libavcodec/bfi.o
 CC	libavcodec/bgmc.o
 CC	libavcodec/bink.o
 CC	libavcodec/binkaudio.o
 CC	libavcodec/binkdsp.o
 CC	libavcodec/bitstream.o
 CC	libavcodec/bitstream_filter.o
-CC	libavcodec/bitstream_filters.o
-CC	libavcodec/blockdsp.o
 /home/mik/src/fate/src/libavcodec/bitstream_filter.c:39:12: warning: returning 'const AVBitStreamFilter *' (aka 'const struct AVBitStreamFilter *') from a function with result type 'AVBitStreamFilter *' (aka 'struct AVBitStreamFilter *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     return av_bsf_next(&opaque);
            ^~~~~~~~~~~~~~~~~~~~
@@ -585,7 +583,9 @@
 /home/mik/src/fate/src/libavcodec/bitstream_filter.c:127:14: warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     pkt.data = buf;
              ^ ~~~
+CC	libavcodec/bitstream_filters.o
 3 warnings generated.
+CC	libavcodec/blockdsp.o
 CC	libavcodec/bmp.o
 CC	libavcodec/bmp_parser.o
 CC	libavcodec/bmpenc.o
@@ -661,7 +661,6 @@
 /home/mik/src/fate/src/libavcodec/decode.c:855:5: note: variable 'ret' is declared here
     enum AVPixelFormat ret, user_choice;
     ^
-CC	libavcodec/dirac.o
 /home/mik/src/fate/src/libavcodec/decode.c:1415:17: warning: 'refcounted_frames' is deprecated [-Wdeprecated-declarations]
     if (!avctx->refcounted_frames)
                 ^
@@ -671,12 +670,13 @@
 /home/mik/src/fate/src/libavutil/attributes.h:76:49: note: expanded from macro 'attribute_deprecated'
 #    define attribute_deprecated __attribute__((deprecated))
                                                 ^
+CC	libavcodec/dirac.o
 CC	libavcodec/dirac_parser.o
 CC	libavcodec/dnxhd_parser.o
 CC	libavcodec/dnxhddata.o
 CC	libavcodec/dnxhddec.o
-CC	libavcodec/dnxhdenc.o
 3 warnings generated.
+CC	libavcodec/dnxhdenc.o
 CC	libavcodec/dpcm.o
 CC	libavcodec/dpx.o
 CC	libavcodec/dpx_parser.o
@@ -716,6 +716,8 @@
 CC	libavcodec/eatqi.o
 CC	libavcodec/elbg.o
 CC	libavcodec/encode.o
+CC	libavcodec/error_resilience.o
+CC	libavcodec/escape124.o
 /home/mik/src/fate/src/libavcodec/encode.c:274:15: warning: 'avcodec_encode_video2' is deprecated [-Wdeprecated-declarations]
         ret = avcodec_encode_video2(avctx, avctx->internal->buffer_pkt,
               ^
@@ -734,10 +736,8 @@
 /home/mik/src/fate/src/libavutil/attributes.h:76:49: note: expanded from macro 'attribute_deprecated'
 #    define attribute_deprecated __attribute__((deprecated))
                                                 ^
-CC	libavcodec/error_resilience.o
-CC	libavcodec/escape124.o
-2 warnings generated.
 CC	libavcodec/escape130.o
+2 warnings generated.
 CC	libavcodec/extract_extradata_bsf.o
 CC	libavcodec/faandct.o
 CC	libavcodec/faanidct.o
@@ -819,10 +819,10 @@
 CC	libavcodec/hevc_cabac.o
 CC	libavcodec/hevc_data.o
 CC	libavcodec/hevc_filter.o
-CC	libavcodec/hevc_mp4toannexb_bsf.o
 /home/mik/src/fate/src/libavcodec/hevc_cabac.c:36:21: warning: variable 'num_bins_in_se' is not needed and will not be emitted [-Wunneeded-internal-declaration]
 static const int8_t num_bins_in_se[] = {
                     ^
+CC	libavcodec/hevc_mp4toannexb_bsf.o
 CC	libavcodec/hevc_mvs.o
 1 warning generated.
 CC	libavcodec/hevc_parser.o
@@ -1017,10 +1017,10 @@
 /home/mik/src/fate/src/libavcodec/bytestream.h:261:70: note: passing argument to parameter 'dst' here
                                                             uint8_t *dst,
                                                                      ^
-2 warnings generated.
 CC	libavcodec/pcm.o
-1 warning generated.
+2 warnings generated.
 CC	libavcodec/pcx.o
+1 warning generated.
 CC	libavcodec/pcxenc.o
 CC	libavcodec/pgssubdec.o
 CC	libavcodec/pictordec.o
@@ -1031,25 +1031,25 @@
 CC	libavcodec/pnm_parser.o
 CC	libavcodec/pnmdec.o
 CC	libavcodec/pnmenc.o
-CC	libavcodec/ppc/apedsp_altivec.o
 /home/mik/src/fate/src/libavcodec/pnmdec.c:41:25: warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     s->bytestream       = buf;
                         ^ ~~~
 /home/mik/src/fate/src/libavcodec/pnmdec.c:42:25: warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     s->bytestream_end   = buf + buf_size;
                         ^ ~~~~~~~~~~~~~~
+CC	libavcodec/ppc/apedsp_altivec.o
 CC	libavcodec/ppc/audiodsp.o
 CC	libavcodec/ppc/blockdsp.o
 CC	libavcodec/ppc/fdctdsp.o
 AS	libavcodec/ppc/fft_altivec.o
 CC	libavcodec/ppc/fft_init.o
 CC	libavcodec/ppc/fmtconvert_altivec.o
+2 warnings generated.
 CC	libavcodec/ppc/h264chroma_init.o
 CC	libavcodec/ppc/h264dsp.o
 CC	libavcodec/ppc/h264qpel.o
 CC	libavcodec/ppc/hevcdsp.o
 CC	libavcodec/ppc/hpeldsp_altivec.o
-2 warnings generated.
 CC	libavcodec/ppc/huffyuvdsp_altivec.o
 CC	libavcodec/ppc/idctdsp.o
 CC	libavcodec/ppc/mdct_init.o
@@ -1147,13 +1147,13 @@
 CC	libavcodec/svq1enc.o
 CC	libavcodec/svq3.o
 CC	libavcodec/synth_filter.o
+CC	libavcodec/tak.o
 /home/mik/src/fate/src/libavcodec/svq3.c:1048:21: warning: passing 'const uint8_t *' (aka 'const unsigned char *') to parameter of type 'void *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
             AV_WL32(&s->bc_slice.buffer[1], header ^ s->watermark_key);
                     ^~~~~~~~~~~~~~~~~~~~~~
 /home/mik/src/fate/src/libavutil/ppc/intreadwrite.h:66:53: note: passing argument to parameter 'p' here
 static av_always_inline void av_write_bswap32(void *p, uint32_t v)
                                                     ^
-CC	libavcodec/tak.o
 CC	libavcodec/tak_parser.o
 CC	libavcodec/takdec.o
 CC	libavcodec/targa.o
@@ -1205,13 +1205,13 @@
 CC	libavcodec/vorbis.o
 CC	libavcodec/vorbis_data.o
 CC	libavcodec/vorbis_parser.o
-CC	libavcodec/vorbisdec.o
 /home/mik/src/fate/src/libavcodec/vorbis_parser.c:194:42: warning: passing 'const uint8_t *' (aka 'const unsigned char *') to parameter of type 'uint8_t *' (aka 'unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     if ((ret = avpriv_split_xiph_headers(extradata,
                                          ^~~~~~~~~
 /home/mik/src/fate/src/libavcodec/xiph.h:39:40: note: passing argument to parameter 'extradata' here
 int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
                                        ^
+CC	libavcodec/vorbisdec.o
 1 warning generated.
 CC	libavcodec/vorbisdsp.o
 CC	libavcodec/vorbisenc.o
@@ -1337,6 +1337,7 @@
 CC	libavutil/hwcontext.o
 CC	libavutil/imgutils.o
 CC	libavutil/intmath.o
+CC	libavutil/lfg.o
 /home/mik/src/fate/src/libavutil/imgutils.c:376:62: warning: passing 'const uint8_t *' (aka 'const unsigned char *') to parameter of type 'uint8_t *' (aka 'unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     return av_image_fill_pointers(dst_data, pix_fmt, height, src, dst_linesize);
                                                              ^~~
@@ -1347,7 +1348,6 @@
     uint8_t clear_block[4][MAX_BLOCK_SIZE] = {0}; // clear padding with 0
                                               ^
                                               {}
-CC	libavutil/lfg.o
 CC	libavutil/lls.o
 CC	libavutil/log.o
 CC	libavutil/log2_tab.o
@@ -1356,8 +1356,8 @@
 CC	libavutil/md5.o
 CC	libavutil/mem.o
 CC	libavutil/opt.o
-CC	libavutil/parseutils.o
 2 warnings generated.
+CC	libavutil/parseutils.o
 CC	libavutil/pixdesc.o
 CC	libavutil/ppc/cpu.o
 CC	libavutil/ppc/float_dsp_init.o
@@ -1374,8 +1374,8 @@
 CC	libavutil/time.o
 CC	libavutil/tree.o
 CC	libavutil/utils.o
-CC	libavutil/xtea.o
 1 warning generated.
+CC	libavutil/xtea.o
 CC	avtools/avconv_opt.o
 CC	avtools/avconv_filter.o
 CC	avtools/avconv_hw.o
@@ -1384,14 +1384,14 @@
 CC	avtools/avprobe.o
 HOSTCC	doc/print_options.o
 AR	libavformat/libavformat.a
-AR	libavcodec/libavcodec.a
 AR	libswscale/libswscale.a
+AR	libavcodec/libavcodec.a
+AR	libavutil/libavutil.a
 HOSTLD	doc/print_options
 GENTEXI	doc/avoptions_format.texi
 GENTEXI	doc/avoptions_codec.texi
 POD	doc/avconv.pod
 POD	doc/avprobe.pod
-AR	libavutil/libavutil.a
 MAN	doc/avconv.1
 MAN	doc/avprobe.1
 LD	avprobe
@@ -1442,16 +1442,15 @@
 INSTALL	libavutil/libavutil.a
 INSTALL	libavdevice/avdevice.h
 INSTALL	libavdevice/version.h
-INSTALL	libavdevice/libavdevice.pc
 INSTALL	libavfilter/avfilter.h
 INSTALL	libavfilter/buffersink.h
 INSTALL	libavfilter/buffersrc.h
 INSTALL	libavfilter/version.h
+INSTALL	libavfilter/libavfilter.pc
+INSTALL	libavdevice/libavdevice.pc
 INSTALL	libavformat/avformat.h
 INSTALL	libavformat/avio.h
 INSTALL	libavformat/version.h
-INSTALL	libavformat/libavformat.pc
-INSTALL	libavfilter/libavfilter.pc
 INSTALL	libavcodec/ac3_parser.h
 INSTALL	libavcodec/adts_parser.h
 INSTALL	libavcodec/avcodec.h
@@ -1465,6 +1464,7 @@
 INSTALL	libavcodec/vda.h
 INSTALL	libavcodec/vdpau.h
 INSTALL	libavcodec/version.h
+INSTALL	libavformat/libavformat.pc
 INSTALL	libavcodec/vorbis_parser.h
 INSTALL	libavcodec/libavcodec.pc
 INSTALL	libavresample/avresample.h
@@ -1473,7 +1473,6 @@
 INSTALL	libswscale/swscale.h
 INSTALL	libswscale/version.h
 INSTALL	libswscale/libswscale.pc
-INSTALL	libavutil/libavutil.pc
 INSTALL	libavutil/adler32.h
 INSTALL	libavutil/aes.h
 INSTALL	libavutil/attributes.h
@@ -1530,6 +1529,7 @@
 INSTALL	libavutil/xtea.h
 INSTALL	libavutil/lzo.h
 INSTALL	libavutil/avconfig.h
+INSTALL	libavutil/libavutil.pc
 INSTALL	install-progs-yes
 INSTALL	avconv
 INSTALL	avprobe