--- /dev/fd/5	2019-02-16 11:11:35.008000000 +0100
+++ -	2019-02-16 11:11:35.009786409 +0100
@@ -67,8 +67,8 @@
 CC	libavfilter/vf_hwmap.o
 CC	libavfilter/vf_hwupload.o
 CC	libavfilter/vf_interlace.o
-CC	libavfilter/vf_null.o
 CC	libavfilter/vf_lut.o
+CC	libavfilter/vf_null.o
 CC	libavfilter/vf_overlay.o
 CC	libavfilter/vf_pad.o
 CC	libavfilter/vf_pixdesctest.o
@@ -86,11 +86,11 @@
 /home/mik/src/fate/src/libavfilter/vf_scale.c:291:27: warning: passing argument 2 of 'sws_scale' from incompatible pointer type
      sws_scale(scale->sws, in->data, in->linesize, 0, in->height,
                            ^
+CC	libavfilter/vf_showinfo.o
 In file included from /home/mik/src/fate/src/libavfilter/vf_scale.c:39:0:
 /home/mik/src/fate/src/libswscale/swscale.h:207:5: note: expected 'const uint8_t * const*' but argument is of type 'uint8_t **'
  int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
      ^
-CC	libavfilter/vf_showinfo.o
 CC	libavfilter/vf_shuffleplanes.o
 CC	libavfilter/vf_transpose.o
 CC	libavfilter/vf_unsharp.o
@@ -103,8 +103,6 @@
 CC	libavfilter/vsrc_nullsrc.o
 CC	libavfilter/vsrc_testsrc.o
 GEN	libavfilter/libavfilter.pc
-CC	libavformat/4xm.o
-CC	libavformat/a64.o
 /home/mik/src/fate/src/libavfilter/vsrc_movie.c: In function 'movie_init':
 /home/mik/src/fate/src/libavfilter/vsrc_movie.c:160:5: warning: 'refcounted_frames' is deprecated (declared at /home/mik/src/fate/src/libavcodec/avcodec.h:2019) [-Wdeprecated-declarations]
      movie->codec_ctx->refcounted_frames = 1;
@@ -113,6 +111,8 @@
 /home/mik/src/fate/src/libavfilter/vsrc_movie.c:232:13: warning: 'avcodec_decode_video2' is deprecated (declared at /home/mik/src/fate/src/libavcodec/avcodec.h:3975) [-Wdeprecated-declarations]
              avcodec_decode_video2(movie->codec_ctx, movie->frame, &frame_decoded, &pkt);
              ^
+CC	libavformat/4xm.o
+CC	libavformat/a64.o
 CC	libavformat/aacdec.o
 CC	libavformat/ac3dec.o
 CC	libavformat/adtsenc.o
@@ -138,8 +138,6 @@
 CC	libavformat/avidec.o
 CC	libavformat/avienc.o
 CC	libavformat/avio.o
-CC	libavformat/aviobuf.o
-CC	libavformat/avlanguage.o
 /home/mik/src/fate/src/libavformat/avio.c: In function 'ffurl_write':
 /home/mik/src/fate/src/libavformat/avio.c:265:38: warning: passing argument 2 of 'retry_transfer_wrapper' discards 'const' qualifier from pointer target type
      return retry_transfer_wrapper(h, buf, size, size,
@@ -147,6 +145,8 @@
 /home/mik/src/fate/src/libavformat/avio.c:200:19: note: expected 'uint8_t *' but argument is of type 'const unsigned char *'
  static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
                    ^
+CC	libavformat/aviobuf.o
+CC	libavformat/avlanguage.o
 CC	libavformat/avs.o
 CC	libavformat/bethsoftvid.o
 CC	libavformat/bfi.o
@@ -311,17 +311,19 @@
 CC	libavformat/psxstr.o
 CC	libavformat/pva.o
 CC	libavformat/qcp.o
-CC	libavformat/r3d.o
 /home/mik/src/fate/src/libavformat/protocols.c: In function 'avio_enum_protocols':
 /home/mik/src/fate/src/libavformat/protocols.c:87:7: warning: assignment discards 'const' qualifier from pointer target type
      p = p ? p + 1 : url_protocols;
        ^
+CC	libavformat/r3d.o
 CC	libavformat/rawdec.o
 CC	libavformat/rawenc.o
 CC	libavformat/rawvideodec.o
 CC	libavformat/rdt.o
 CC	libavformat/replaygain.o
 CC	libavformat/riff.o
+CC	libavformat/riffdec.o
+CC	libavformat/riffenc.o
 /home/mik/src/fate/src/libavformat/rdt.c: In function 'rdt_parse_packet':
 /home/mik/src/fate/src/libavformat/rdt.c:305:32: warning: passing argument 2 of 'ffio_init_context' discards 'const' qualifier from pointer target type
          ffio_init_context(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
@@ -330,8 +332,6 @@
 /home/mik/src/fate/src/libavformat/avio_internal.h:29:5: note: expected 'unsigned char *' but argument is of type 'const uint8_t *'
  int ffio_init_context(AVIOContext *s,
      ^
-CC	libavformat/riffdec.o
-CC	libavformat/riffenc.o
 CC	libavformat/rl2.o
 CC	libavformat/rm.o
 CC	libavformat/rmdec.o
@@ -375,7 +375,6 @@
 CC	libavformat/rtpdec_qcelp.o
 CC	libavformat/rtpdec_qdm2.o
 CC	libavformat/rtpdec_qt.o
-CC	libavformat/rtpdec_svq3.o
 /home/mik/src/fate/src/libavformat/rtpdec_qt.c: In function 'qt_rtp_parse_packet':
 /home/mik/src/fate/src/libavformat/rtpdec_qt.c:76:28: warning: passing argument 2 of 'ffio_init_context' discards 'const' qualifier from pointer target type
      ffio_init_context(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
@@ -384,6 +383,7 @@
 /home/mik/src/fate/src/libavformat/avio_internal.h:29:5: note: expected 'unsigned char *' but argument is of type 'const uint8_t *'
  int ffio_init_context(AVIOContext *s,
      ^
+CC	libavformat/rtpdec_svq3.o
 CC	libavformat/rtpdec_vp8.o
 CC	libavformat/rtpdec_vp9.o
 CC	libavformat/rtpdec_xiph.o
@@ -508,6 +508,7 @@
 CC	libavcodec/ac3enc_fixed.o
 CC	libavcodec/ac3enc_float.o
 CC	libavcodec/ac3tab.o
+CC	libavcodec/acelp_filters.o
 /home/mik/src/fate/src/libavcodec/ac3enc.c: In function 'ff_ac3_process_exponents':
 /home/mik/src/fate/src/libavcodec/ac3enc.c:386:76: warning: array subscript is above array bounds [-Warray-bounds]
              if (ch == CPL_CH && exp_diff > (EXP_DIFF_THRESHOLD * (s->blocks[blk].end_freq[ch] - s->start_freq[ch]) / AC3_MAX_COEFS))
@@ -518,7 +519,6 @@
 /home/mik/src/fate/src/libavcodec/ac3enc.c:376:38: warning: array subscript is above array bounds [-Warray-bounds]
                  } else if (!s->blocks[blk].cpl_in_use) {
                                       ^
-CC	libavcodec/acelp_filters.o
 CC	libavcodec/acelp_pitch_delay.o
 CC	libavcodec/acelp_vectors.o
 CC	libavcodec/adpcm.o
@@ -664,7 +664,6 @@
      ^
 CC	libavcodec/dirac.o
 CC	libavcodec/dirac_parser.o
-CC	libavcodec/dnxhd_parser.o
 /home/mik/src/fate/src/libavcodec/dca_xll.c: In function 'ff_dca_xll_decode_audio':
 /home/mik/src/fate/src/libavcodec/dca_xll.c:382:41: warning: array subscript is above array bounds [-Warray-bounds]
              c[j]         += ((int64_t) c[i] * r1 + 0x8000) >> 16;
@@ -723,6 +722,7 @@
 /home/mik/src/fate/src/libavcodec/dca_xll.c:383:26: warning: array subscript is above array bounds [-Warray-bounds]
              c[i - j - 1] += ((int64_t) c[i] * r0 + 0x8000) >> 16;
                           ^
+CC	libavcodec/dnxhd_parser.o
 CC	libavcodec/dnxhddata.o
 CC	libavcodec/dnxhddec.o
 CC	libavcodec/dnxhdenc.o
@@ -732,7 +732,6 @@
 CC	libavcodec/dpxenc.o
 CC	libavcodec/dsicinaudio.o
 CC	libavcodec/dsicinvideo.o
-CC	libavcodec/dss_sp.o
 /home/mik/src/fate/src/libavcodec/dpxenc.c: In function 'encode_frame':
 /home/mik/src/fate/src/libavcodec/dpxenc.c:159:40: warning: passing argument 3 of 'av_image_copy_to_buffer' from incompatible pointer type
                                         frame->data, frame->linesize,
@@ -741,6 +740,7 @@
 /home/mik/src/fate/src/libavutil/imgutils.h:197:5: note: expected 'const uint8_t * const*' but argument is of type 'uint8_t * const*'
  int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
      ^
+CC	libavcodec/dss_sp.o
 CC	libavcodec/dump_extradata_bsf.o
 CC	libavcodec/dv.o
 CC	libavcodec/dv_profile.o
@@ -756,11 +756,11 @@
 CC	libavcodec/dxa.o
 CC	libavcodec/dxtory.o
 CC	libavcodec/dxv.o
+CC	libavcodec/eac3_data.o
 /home/mik/src/fate/src/libavcodec/dvenc.c: In function 'dv_encode_video_segment':
 /home/mik/src/fate/src/libavcodec/dvenc.c:372:81: warning: array subscript is above array bounds [-Warray-bounds]
                                      for (a2 = a + 1; b->next[k] >= mb_area_start[a2 + 1]; a2++)
                                                                                  ^
-CC	libavcodec/eac3_data.o
 CC	libavcodec/eac3dec.o
 CC	libavcodec/eac3enc.o
 CC	libavcodec/eacmv.o
@@ -773,6 +773,7 @@
 CC	libavcodec/elsdec.o
 CC	libavcodec/encode.o
 CC	libavcodec/error_resilience.o
+CC	libavcodec/escape124.o
 /home/mik/src/fate/src/libavcodec/encode.c: In function 'do_encode':
 /home/mik/src/fate/src/libavcodec/encode.c:274:9: warning: 'avcodec_encode_video2' is deprecated (declared at /home/mik/src/fate/src/libavcodec/encode.c:200) [-Wdeprecated-declarations]
          ret = avcodec_encode_video2(avctx, avctx->internal->buffer_pkt,
@@ -780,7 +781,6 @@
 /home/mik/src/fate/src/libavcodec/encode.c:277:9: warning: 'avcodec_encode_audio2' is deprecated (declared at /home/mik/src/fate/src/libavcodec/encode.c:90) [-Wdeprecated-declarations]
          ret = avcodec_encode_audio2(avctx, avctx->internal->buffer_pkt,
          ^
-CC	libavcodec/escape124.o
 CC	libavcodec/escape130.o
 CC	libavcodec/exr.o
 CC	libavcodec/extract_extradata_bsf.o
@@ -836,8 +836,8 @@
 CC	libavcodec/h263dsp.o
 CC	libavcodec/h2645_parse.o
 CC	libavcodec/h264_cabac.o
-CC	libavcodec/h264_cavlc.o
 CC	libavcodec/h264_direct.o
+CC	libavcodec/h264_cavlc.o
 /home/mik/src/fate/src/libavcodec/h264_direct.c: In function 'pred_spatial_direct_motion':
 /home/mik/src/fate/src/libavcodec/h264_direct.c:326:12: warning: assignment from incompatible pointer type
      l1mv0  = &sl->ref_list[1][0].parent->motion_val[0][h->mb2b_xy[mb_xy]];
@@ -1034,7 +1034,6 @@
 CC	libavcodec/null_bsf.o
 CC	libavcodec/nuv.o
 CC	libavcodec/on2avc.o
-CC	libavcodec/on2avcdata.o
 /home/mik/src/fate/src/libavcodec/nuv.c: In function 'copy_frame':
 /home/mik/src/fate/src/libavcodec/nuv.c:81:41: warning: passing argument 3 of 'av_image_copy' from incompatible pointer type
      av_image_copy(f->data, f->linesize, src_data, src_linesize,
@@ -1043,6 +1042,7 @@
 /home/mik/src/fate/src/libavutil/imgutils.h:116:6: note: expected 'const uint8_t **' but argument is of type 'uint8_t **'
  void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
       ^
+CC	libavcodec/on2avcdata.o
 CC	libavcodec/options.o
 CC	libavcodec/opus.o
 CC	libavcodec/opus_celt.o
@@ -1070,7 +1070,6 @@
  static av_always_inline unsigned int bytestream2_get_buffer(GetByteContext *g,
                                       ^
 CC	libavcodec/pcm-dvd.o
-CC	libavcodec/pcm.o
 /home/mik/src/fate/src/libavcodec/pcm-dvd.c: In function 'pcm_dvd_decode_samples':
 /home/mik/src/fate/src/libavcodec/pcm-dvd.c:162:37: warning: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type
          bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
@@ -1079,6 +1078,7 @@
 /home/mik/src/fate/src/libavcodec/bytestream.h:260:38: note: expected 'uint8_t *' but argument is of type 'int16_t *'
  static av_always_inline unsigned int bytestream2_get_buffer(GetByteContext *g,
                                       ^
+CC	libavcodec/pcm.o
 CC	libavcodec/pcx.o
 CC	libavcodec/pcxenc.o
 CC	libavcodec/pgssubdec.o
@@ -1094,7 +1094,6 @@
 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: In function 'pnm_decode_frame':
 /home/mik/src/fate/src/libavcodec/pnmdec.c:41:25: warning: assignment discards 'const' qualifier from pointer target type
      s->bytestream       = buf;
@@ -1102,6 +1101,7 @@
 /home/mik/src/fate/src/libavcodec/pnmdec.c:42:25: warning: assignment discards 'const' qualifier from pointer target type
      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
@@ -1278,6 +1278,7 @@
 CC	libavcodec/vorbis_parser.o
 CC	libavcodec/vorbisdec.o
 CC	libavcodec/vorbisdsp.o
+CC	libavcodec/vorbisenc.o
 /home/mik/src/fate/src/libavcodec/vorbis_parser.c: In function 'vorbis_parse_init':
 /home/mik/src/fate/src/libavcodec/vorbis_parser.c:194:42: warning: passing argument 1 of 'avpriv_split_xiph_headers' discards 'const' qualifier from pointer target type
      if ((ret = avpriv_split_xiph_headers(extradata,
@@ -1286,7 +1287,6 @@
 /home/mik/src/fate/src/libavcodec/xiph.h:39:5: note: expected 'uint8_t *' but argument is of type 'const uint8_t *'
  int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
      ^
-CC	libavcodec/vorbisenc.o
 CC	libavcodec/vp3.o
 CC	libavcodec/vp3_parser.o
 CC	libavcodec/vp3dsp.o
@@ -1381,6 +1381,7 @@
 CC	libavutil/crc.o
 CC	libavutil/des.o
 CC	libavutil/dict.o
+CC	libavutil/display.o
 /home/mik/src/fate/src/libavutil/dict.c: In function 'av_dict_set':
 /home/mik/src/fate/src/libavutil/dict.c:83:58: warning: passing argument 1 of 'av_free' discards 'const' qualifier from pointer target type
              if (flags & AV_DICT_DONT_STRDUP_KEY) av_free(key);
@@ -1404,7 +1405,6 @@
 /home/mik/src/fate/src/libavutil/dict.c:109:38: warning: assignment discards 'const' qualifier from pointer target type
              m->elems[m->count].value = value;
                                       ^
-CC	libavutil/display.o
 CC	libavutil/downmix_info.o
 CC	libavutil/error.o
 CC	libavutil/eval.o
@@ -1447,11 +1447,11 @@
 CC	libavutil/rational.o
 CC	libavutil/rc4.o
 CC	libavutil/samplefmt.o
-CC	libavutil/sha.o
 /home/mik/src/fate/src/libavutil/samplefmt.c: In function 'av_samples_fill_arrays':
 /home/mik/src/fate/src/libavutil/samplefmt.c:152:19: warning: assignment discards 'const' qualifier from pointer target type
      audio_data[0] = buf;
                    ^
+CC	libavutil/sha.o
 CC	libavutil/spherical.o
 CC	libavutil/stereo3d.o
 CC	libavutil/time.o
@@ -1472,11 +1472,11 @@
 HOSTLD	doc/print_options
 GENTEXI	doc/avoptions_format.texi
 GENTEXI	doc/avoptions_codec.texi
-POD	doc/avprobe.pod
 POD	doc/avconv.pod
+POD	doc/avprobe.pod
 MAN	doc/avprobe.1
-LD	avprobe
 MAN	doc/avconv.1
+LD	avprobe
 /usr/bin/ld: skipping incompatible /home/mik/misc/lib32/../lib/libz.a when searching for -lz
 /usr/bin/ld: skipping incompatible /home/mik/misc/lib32/../lib/libz.a when searching for -lz
 LD	avconv
@@ -1487,7 +1487,6 @@
 INSTALL	libavdevice/libavdevice.a
 INSTALL	libavfilter/libavfilter.a
 INSTALL	libavformat/libavformat.a
-INSTALL	libavcodec/libavcodec.a
 INSTALL	presets/libx264-slow.avpreset
 INSTALL	presets/libx264-lossless_slower.avpreset
 INSTALL	presets/libx264-faster.avpreset
@@ -1523,6 +1522,7 @@
 INSTALL	presets/libx264-fast.avpreset
 INSTALL	presets/libvpx-360p.avpreset
 INSTALL	presets/libx264-fast_firstpass.avpreset
+INSTALL	libavcodec/libavcodec.a
 INSTALL	libavresample/libavresample.a
 INSTALL	libswscale/libswscale.a
 INSTALL	libavutil/libavutil.a
@@ -1534,11 +1534,10 @@
 INSTALL	libavfilter/buffersrc.h
 INSTALL	libavfilter/version.h
 INSTALL	libavfilter/libavfilter.pc
+INSTALL	libavformat/libavformat.pc
 INSTALL	libavformat/avformat.h
 INSTALL	libavformat/avio.h
 INSTALL	libavformat/version.h
-INSTALL	libavformat/libavformat.pc
-INSTALL	libavcodec/libavcodec.pc
 INSTALL	libavcodec/ac3_parser.h
 INSTALL	libavcodec/adts_parser.h
 INSTALL	libavcodec/avcodec.h
@@ -1553,12 +1552,14 @@
 INSTALL	libavcodec/vdpau.h
 INSTALL	libavcodec/version.h
 INSTALL	libavcodec/vorbis_parser.h
+INSTALL	libavcodec/libavcodec.pc
 INSTALL	libavresample/avresample.h
 INSTALL	libavresample/version.h
 INSTALL	libavresample/libavresample.pc
 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
@@ -1615,7 +1616,6 @@
 INSTALL	libavutil/xtea.h
 INSTALL	libavutil/lzo.h
 INSTALL	libavutil/avconfig.h
-INSTALL	libavutil/libavutil.pc
 INSTALL	install-progs-yes
 INSTALL	avconv
 INSTALL	avprobe