--- /dev/fd/5	2019-02-18 22:08:55.576000000 +0100
+++ -	2019-02-18 22:08:55.581159911 +0100
@@ -2,8 +2,8 @@
 GEN	libavcodec/libavcodec.version
 GEN	libavformat/libavformat.version
 GEN	libswscale/libswscale.version
-GEN	libavresample/libavresample.version
 GEN	libavfilter/libavfilter.version
+GEN	libavresample/libavresample.version
 GEN	libavdevice/libavdevice.version
 CC	libavdevice/alldevices.o
 CC	libavdevice/avdevice.o
@@ -39,7 +39,6 @@
 CC	libavformat/avienc.o
 CC	libavformat/avio.o
 CC	libavformat/aviobuf.o
-CC	libavformat/avlanguage.o
 /home/mik/src/fate/src/libavformat/avio.c:265:38: warning: passing 'const unsigned char *' to parameter of type 'uint8_t *' (aka 'unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     return retry_transfer_wrapper(h, buf, size, size,
                                      ^~~
@@ -47,6 +46,7 @@
 static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
                                                                  ^
 1 warning generated.
+CC	libavformat/avlanguage.o
 CC	libavformat/avs.o
 CC	libavformat/bethsoftvid.o
 CC	libavformat/bfi.o
@@ -129,8 +129,8 @@
 CC	libavformat/isom.o
 CC	libavformat/iss.o
 CC	libavformat/iv8.o
-CC	libavformat/ivfenc.o
 CC	libavformat/ivfdec.o
+CC	libavformat/ivfenc.o
 CC	libavformat/jvdec.o
 CC	libavformat/latmenc.o
 CC	libavformat/lmlm4.o
@@ -196,8 +196,8 @@
 CC	libavformat/oma.o
 CC	libavformat/omadec.o
 CC	libavformat/omaenc.o
-CC	libavformat/os_support.o
 CC	libavformat/options.o
+CC	libavformat/os_support.o
 CC	libavformat/paf.o
 CC	libavformat/pcm.o
 CC	libavformat/pcmdec.o
@@ -218,13 +218,6 @@
 CC	libavformat/rdt.o
 CC	libavformat/replaygain.o
 CC	libavformat/riff.o
-/home/mik/src/fate/src/libavformat/rdt.c:305:32: 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,
-                                 ^
-1 warning generated.
 CC	libavformat/riffdec.o
 CC	libavformat/riffenc.o
 CC	libavformat/rl2.o
@@ -237,6 +230,13 @@
 CC	libavformat/rsodec.o
 CC	libavformat/rsoenc.o
 CC	libavformat/rtmpdigest.o
+/home/mik/src/fate/src/libavformat/rdt.c:305:32: 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,
+                                 ^
+1 warning generated.
 CC	libavformat/rtmphttp.o
 CC	libavformat/rtmppkt.o
 CC	libavformat/rtmpproto.o
@@ -247,7 +247,6 @@
 CC	libavformat/rtpdec_asf.o
 CC	libavformat/rtpdec_dv.o
 CC	libavformat/rtpdec_g726.o
-CC	libavformat/rtpdec_h261.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);
                               ^~~
@@ -255,6 +254,7 @@
                   unsigned char *buffer,
                                  ^
 1 warning generated.
+CC	libavformat/rtpdec_h261.o
 CC	libavformat/rtpdec_h263.o
 CC	libavformat/rtpdec_h263_rfc2190.o
 CC	libavformat/rtpdec_h264.o
@@ -269,6 +269,7 @@
 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: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);
                            ^~~
@@ -276,7 +277,6 @@
                   unsigned char *buffer,
                                  ^
 1 warning generated.
-CC	libavformat/rtpdec_svq3.o
 CC	libavformat/rtpdec_vp8.o
 CC	libavformat/rtpdec_vp9.o
 CC	libavformat/rtpdec_xiph.o
@@ -373,11 +373,10 @@
 CC	libavfilter/af_volume.o
 CC	libavfilter/allfilters.o
 CC	libavfilter/asink_anullsink.o
-CC	libavfilter/asrc_anullsrc.o
 CC	libavfilter/audio.o
 CC	libavfilter/avfilter.o
 CC	libavfilter/avfiltergraph.o
-CC	libavfilter/buffersink.o
+CC	libavfilter/asrc_anullsrc.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,
                                                     ^~~~~~~~~~~
@@ -385,6 +384,7 @@
                    const uint8_t *src_data[4], const int src_linesizes[4],
                                   ^
 1 warning generated.
+CC	libavfilter/buffersink.o
 CC	libavfilter/buffersrc.o
 CC	libavfilter/drawutils.o
 CC	libavfilter/fifo.o
@@ -422,7 +422,6 @@
 CC	libavfilter/vf_pixdesctest.o
 CC	libavfilter/vf_scale.o
 CC	libavfilter/vf_select.o
-CC	libavfilter/vf_showinfo.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,
                                ^~~~~~~~
@@ -437,6 +436,7 @@
 int sws_scale(struct SwsContext *c, const uint8_t *const srcSlice[],
                                                          ^
 1 warning generated.
+CC	libavfilter/vf_showinfo.o
 CC	libavfilter/vf_shuffleplanes.o
 CC	libavfilter/vf_transpose.o
 CC	libavfilter/vf_unsharp.o
@@ -446,6 +446,7 @@
 CC	libavfilter/vsink_nullsink.o
 CC	libavfilter/vsrc_color.o
 CC	libavfilter/vsrc_movie.o
+CC	libavfilter/vsrc_nullsrc.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;
                       ^
@@ -459,7 +460,6 @@
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
     ^
 2 warnings generated.
-CC	libavfilter/vsrc_nullsrc.o
 CC	libavfilter/vsrc_testsrc.o
 GEN	libavfilter/libavfilter.pc
 CC	libswscale/input.o
@@ -470,15 +470,15 @@
 CC	libswscale/swscale_unscaled.o
 CC	libswscale/utils.o
 CC	libswscale/yuv2rgb.o
-AR	libavformat/libavformat.a
 GEN	libavformat/libavformat.pc
+AR	libavformat/libavformat.a
 GEN	libavcodec/libavcodec.pc
 GEN	libavresample/libavresample.pc
-GEN	libswscale/libswscale.pc
 AR	libswscale/libswscale.a
+GEN	libswscale/libswscale.pc
 GEN	libavutil/libavutil.pc
-GEN	libavdevice/libavdevice.ver
 AR	libavdevice/libavdevice.a
+GEN	libavdevice/libavdevice.ver
 GEN	libavformat/libavformat.ver
 CC	libavcodec/4xm.o
 CC	libavcodec/8bps.o
@@ -497,12 +497,12 @@
 CC	libavcodec/aactab.o
 CC	libavcodec/aandcttab.o
 CC	libavcodec/aasc.o
-CC	libavcodec/ac3_parser.o
 CC	libavcodec/ac3.o
+CC	libavcodec/ac3_parser.o
 CC	libavcodec/ac3dec.o
 CC	libavcodec/ac3dec_data.o
-CC	libavcodec/ac3enc.o
 CC	libavcodec/ac3dsp.o
+CC	libavcodec/ac3enc.o
 CC	libavcodec/ac3enc_fixed.o
 CC	libavcodec/ac3enc_float.o
 CC	libavcodec/ac3tab.o
@@ -531,8 +531,8 @@
 CC	libavcodec/anm.o
 CC	libavcodec/ansi.o
 CC	libavcodec/apedec.o
-CC	libavcodec/arm/aacpsdsp_init_arm.o
 AS	libavcodec/arm/aacpsdsp_neon.o
+CC	libavcodec/arm/aacpsdsp_init_arm.o
 AS	libavcodec/arm/ac3dsp_arm.o
 AS	libavcodec/arm/ac3dsp_armv6.o
 CC	libavcodec/arm/ac3dsp_init_arm.o
@@ -748,8 +748,8 @@
 CC	libavcodec/dct32_fixed.o
 CC	libavcodec/dct32_float.o
 CC	libavcodec/dds.o
-CC	libavcodec/decode.o
 CC	libavcodec/dfa.o
+CC	libavcodec/decode.o
 /home/mik/src/fate/src/libavcodec/decode.c:580:25: warning: 'refcounted_frames' is deprecated [-Wdeprecated-declarations]
             if (!avctx->refcounted_frames) {
                         ^
@@ -783,10 +783,8 @@
 CC	libavcodec/dnxhdenc.o
 CC	libavcodec/dpcm.o
 CC	libavcodec/dpx.o
-CC	libavcodec/dpx_parser.o
 CC	libavcodec/dpxenc.o
-CC	libavcodec/dsicinaudio.o
-CC	libavcodec/dsicinvideo.o
+CC	libavcodec/dpx_parser.o
 /home/mik/src/fate/src/libavcodec/dpxenc.c:159:40: 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]
                                        frame->data, frame->linesize,
                                        ^~~~~~~~~~~
@@ -794,6 +792,8 @@
                             const uint8_t * const src_data[4], const int src_linesize[4],
                                                   ^
 1 warning generated.
+CC	libavcodec/dsicinaudio.o
+CC	libavcodec/dsicinvideo.o
 CC	libavcodec/dss_sp.o
 CC	libavcodec/dump_extradata_bsf.o
 CC	libavcodec/dv.o
@@ -822,6 +822,13 @@
 CC	libavcodec/elbg.o
 CC	libavcodec/elsdec.o
 CC	libavcodec/encode.o
+CC	libavcodec/error_resilience.o
+CC	libavcodec/escape124.o
+CC	libavcodec/escape130.o
+CC	libavcodec/exr.o
+CC	libavcodec/extract_extradata_bsf.o
+CC	libavcodec/faandct.o
+CC	libavcodec/faanidct.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,
               ^
@@ -835,13 +842,6 @@
 int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
                         ^
 2 warnings generated.
-CC	libavcodec/error_resilience.o
-CC	libavcodec/escape124.o
-CC	libavcodec/escape130.o
-CC	libavcodec/exr.o
-CC	libavcodec/extract_extradata_bsf.o
-CC	libavcodec/faandct.o
-CC	libavcodec/faanidct.o
 CC	libavcodec/faxcompr.o
 CC	libavcodec/fdctdsp.o
 CC	libavcodec/fft_fixed.o
@@ -854,14 +854,14 @@
 CC	libavcodec/flac_parser.o
 CC	libavcodec/flacdata.o
 CC	libavcodec/flacdec.o
-CC	libavcodec/flacenc.o
 CC	libavcodec/flacdsp.o
+CC	libavcodec/flacenc.o
 CC	libavcodec/flashsv.o
 CC	libavcodec/flashsvenc.o
 CC	libavcodec/flicvideo.o
 CC	libavcodec/flvdec.o
-CC	libavcodec/flvenc.o
 CC	libavcodec/fmtconvert.o
+CC	libavcodec/flvenc.o
 CC	libavcodec/fmvc.o
 CC	libavcodec/fraps.o
 CC	libavcodec/frwu.o
@@ -873,12 +873,12 @@
 CC	libavcodec/g723_1.o
 CC	libavcodec/g723_1dec.o
 CC	libavcodec/g723_1enc.o
-CC	libavcodec/gif.o
 CC	libavcodec/g726.o
+CC	libavcodec/gif.o
 CC	libavcodec/gifdec.o
 CC	libavcodec/golomb.o
-CC	libavcodec/gsm_parser.o
 CC	libavcodec/gsmdec.o
+CC	libavcodec/gsm_parser.o
 CC	libavcodec/gsmdec_data.o
 CC	libavcodec/h261.o
 CC	libavcodec/h261_parser.o
@@ -918,19 +918,19 @@
 CC	libavcodec/hapdec.o
 CC	libavcodec/hevc_cabac.o
 CC	libavcodec/hevc_data.o
-CC	libavcodec/hevc_filter.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[] = {
                     ^
 1 warning generated.
+CC	libavcodec/hevc_filter.o
 CC	libavcodec/hevc_mp4toannexb_bsf.o
 CC	libavcodec/hevc_mvs.o
 CC	libavcodec/hevc_parser.o
 CC	libavcodec/hevc_ps.o
 CC	libavcodec/hevc_refs.o
 CC	libavcodec/hevc_sei.o
-CC	libavcodec/hevcdsp.o
 CC	libavcodec/hevcdec.o
+CC	libavcodec/hevcdsp.o
 CC	libavcodec/hevcpred.o
 CC	libavcodec/hnm4video.o
 CC	libavcodec/hpeldsp.o
@@ -964,8 +964,8 @@
 CC	libavcodec/intrax8dsp.o
 CC	libavcodec/ituh263dec.o
 CC	libavcodec/ituh263enc.o
-CC	libavcodec/ivi.o
 CC	libavcodec/ivi_dsp.o
+CC	libavcodec/ivi.o
 CC	libavcodec/jfdctfst.o
 CC	libavcodec/jfdctint.o
 CC	libavcodec/jpeg2000.o
@@ -1023,8 +1023,8 @@
 CC	libavcodec/mpc7.o
 CC	libavcodec/mpc8.o
 CC	libavcodec/mpeg12.o
-CC	libavcodec/mpeg12dec.o
 CC	libavcodec/mpeg12data.o
+CC	libavcodec/mpeg12dec.o
 CC	libavcodec/mpeg12enc.o
 CC	libavcodec/mpeg12framerate.o
 CC	libavcodec/mpeg2_metadata_bsf.o
@@ -1051,8 +1051,8 @@
 CC	libavcodec/mpegvideo_enc.o
 CC	libavcodec/mpegvideo_motion.o
 CC	libavcodec/mpegvideo_parser.o
-CC	libavcodec/mpegvideodsp.o
 CC	libavcodec/mpegvideodata.o
+CC	libavcodec/mpegvideodsp.o
 CC	libavcodec/mpegvideoencdsp.o
 CC	libavcodec/mqc.o
 CC	libavcodec/mqcdec.o
@@ -1081,7 +1081,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:81:41: warning: passing 'uint8_t *[4]' 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(f->data, f->linesize, src_data, src_linesize,
                                         ^~~~~~~~
@@ -1089,11 +1088,12 @@
                    const uint8_t *src_data[4], const int src_linesizes[4],
                                   ^
 1 warning generated.
+CC	libavcodec/on2avcdata.o
 CC	libavcodec/options.o
 CC	libavcodec/opus.o
 CC	libavcodec/opus_celt.o
-CC	libavcodec/opus_silk.o
 CC	libavcodec/opus_parser.o
+CC	libavcodec/opus_silk.o
 CC	libavcodec/opusdec.o
 CC	libavcodec/pafaudio.o
 CC	libavcodec/pafvideo.o
@@ -1105,8 +1105,8 @@
 CC	libavcodec/pcx.o
 CC	libavcodec/pcxenc.o
 CC	libavcodec/pgssubdec.o
-CC	libavcodec/pixblockdsp.o
 CC	libavcodec/pictordec.o
+CC	libavcodec/pixblockdsp.o
 CC	libavcodec/pixlet.o
 CC	libavcodec/png.o
 CC	libavcodec/png_parser.o
@@ -1116,13 +1116,6 @@
 CC	libavcodec/pnm.o
 CC	libavcodec/pnm_parser.o
 CC	libavcodec/pnmdec.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;
-                        ^ ~~~~~~~~~~~~~~
-2 warnings generated.
 CC	libavcodec/pnmenc.o
 CC	libavcodec/profiles.o
 CC	libavcodec/proresdata.o
@@ -1139,6 +1132,13 @@
 CC	libavcodec/qdrw.o
 CC	libavcodec/qpeg.o
 CC	libavcodec/qpeldsp.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;
+                        ^ ~~~~~~~~~~~~~~
+2 warnings generated.
 CC	libavcodec/qsv_api.o
 CC	libavcodec/qtrle.o
 CC	libavcodec/qtrleenc.o
@@ -1153,6 +1153,7 @@
 CC	libavcodec/raw.o
 CC	libavcodec/rawdec.o
 CC	libavcodec/rawenc.o
+CC	libavcodec/rdft.o
 /home/mik/src/fate/src/libavcodec/rawenc.c:63:40: 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]
                                        frame->data, frame->linesize,
                                        ^~~~~~~~~~~
@@ -1160,7 +1161,6 @@
                             const uint8_t * const src_data[4], const int src_linesize[4],
                                                   ^
 1 warning generated.
-CC	libavcodec/rdft.o
 CC	libavcodec/remove_extradata_bsf.o
 CC	libavcodec/rl.o
 CC	libavcodec/rl2.o
@@ -1198,8 +1198,8 @@
 CC	libavcodec/smc.o
 CC	libavcodec/snappy.o
 CC	libavcodec/sp5xdec.o
-CC	libavcodec/srtdec.o
 CC	libavcodec/startcode.o
+CC	libavcodec/srtdec.o
 CC	libavcodec/sunrast.o
 CC	libavcodec/sunrastenc.o
 CC	libavcodec/svq1.o
@@ -1252,8 +1252,8 @@
 CC	libavcodec/v410dec.o
 CC	libavcodec/v410enc.o
 CC	libavcodec/vb.o
-CC	libavcodec/vble.o
 CC	libavcodec/vc1.o
+CC	libavcodec/vble.o
 CC	libavcodec/vc1_block.o
 CC	libavcodec/vc1_loopfilter.o
 CC	libavcodec/vc1_mc.o
@@ -1271,6 +1271,9 @@
 CC	libavcodec/vorbis.o
 CC	libavcodec/vorbis_data.o
 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: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,
                                          ^~~~~~~~~
@@ -1278,9 +1281,6 @@
 int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
                                        ^
 1 warning generated.
-CC	libavcodec/vorbisdec.o
-CC	libavcodec/vorbisdsp.o
-CC	libavcodec/vorbisenc.o
 CC	libavcodec/vp3.o
 CC	libavcodec/vp3_parser.o
 CC	libavcodec/vp3dsp.o
@@ -1350,9 +1350,9 @@
 CC	libavresample/resample.o
 CC	libavresample/utils.o
 CC	libavutil/adler32.o
+CC	libavutil/aes.o
 CC	libavutil/arm/cpu.o
 CC	libavutil/arm/float_dsp_init_arm.o
-CC	libavutil/aes.o
 CC	libavutil/arm/float_dsp_init_neon.o
 CC	libavutil/arm/float_dsp_init_vfp.o
 AS	libavutil/arm/float_dsp_neon.o
@@ -1360,8 +1360,6 @@
 CC	libavutil/audio_fifo.o
 CC	libavutil/avstring.o
 CC	libavutil/base64.o
-CC	libavutil/blowfish.o
-CC	libavutil/buffer.o
 /home/mik/src/fate/src/libavutil/avstring.c:57:16: warning: returning 'const char *' from a function with result type 'char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
         return s1;
                ^~
@@ -1375,6 +1373,8 @@
             return haystack;
                    ^~~~~~~~
 4 warnings generated.
+CC	libavutil/blowfish.o
+CC	libavutil/buffer.o
 CC	libavutil/channel_layout.o
 CC	libavutil/cpu.o
 CC	libavutil/crc.o
@@ -1382,10 +1382,6 @@
 CC	libavutil/dict.o
 CC	libavutil/display.o
 CC	libavutil/downmix_info.o
-CC	libavutil/error.o
-CC	libavutil/eval.o
-CC	libavutil/fifo.o
-CC	libavutil/file.o
 /home/mik/src/fate/src/libavutil/dict.c:83:58: warning: passing 'const char *' to parameter of type 'void *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
             if (flags & AV_DICT_DONT_STRDUP_KEY) av_free(key);
                                                          ^~~
@@ -1405,6 +1401,10 @@
             m->elems[m->count].value = value;
                                      ^ ~~~~~
 4 warnings generated.
+CC	libavutil/error.o
+CC	libavutil/eval.o
+CC	libavutil/fifo.o
+CC	libavutil/file.o
 CC	libavutil/file_open.o
 CC	libavutil/float_dsp.o
 CC	libavutil/frame.o
@@ -1412,8 +1412,6 @@
 CC	libavutil/hwcontext.o
 CC	libavutil/imgutils.o
 CC	libavutil/intmath.o
-CC	libavutil/lfg.o
-CC	libavutil/lls.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);
                                                              ^~~
@@ -1425,13 +1423,15 @@
                                               ^
                                               {}
 2 warnings generated.
-CC	libavutil/log2_tab.o
+CC	libavutil/lfg.o
+CC	libavutil/lls.o
 CC	libavutil/log.o
+CC	libavutil/log2_tab.o
 CC	libavutil/lzo.o
 CC	libavutil/mathematics.o
 CC	libavutil/md5.o
-CC	libavutil/mem.o
 CC	libavutil/opt.o
+CC	libavutil/mem.o
 CC	libavutil/parseutils.o
 CC	libavutil/pixdesc.o
 CC	libavutil/random_seed.o
@@ -1439,22 +1439,22 @@
 CC	libavutil/rc4.o
 CC	libavutil/samplefmt.o
 CC	libavutil/sha.o
-CC	libavutil/spherical.o
-CC	libavutil/stereo3d.o
-CC	libavutil/time.o
 /home/mik/src/fate/src/libavutil/samplefmt.c:152:19: warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
     audio_data[0] = buf;
                   ^ ~~~
 1 warning generated.
+CC	libavutil/spherical.o
+CC	libavutil/stereo3d.o
+CC	libavutil/time.o
 CC	libavutil/tree.o
 CC	libavutil/utils.o
 CC	libavutil/xtea.o
-GEN	libavfilter/libavfilter.ver
 AR	libavfilter/libavfilter.a
+GEN	libavfilter/libavfilter.ver
 GEN	libswscale/libswscale.ver
 AR	libavcodec/libavcodec.a
-CC	avtools/avconv_opt.o
 AR	libavresample/libavresample.a
+CC	avtools/avconv_opt.o
 CC	avtools/avconv_filter.o
 CC	avtools/avconv_hw.o
 CC	avtools/cmdutils.o
@@ -1464,8 +1464,8 @@
 HTML	doc/developer.html
 HTML	doc/faq.html
 HTML	doc/fate.html
-HTML	doc/general.html
 HTML	doc/git-howto.html
+HTML	doc/general.html
 HTML	doc/libavfilter.html
 HTML	doc/nut.html
 HTML	doc/platform.html
@@ -1497,8 +1497,8 @@
 INSTALL	libavfilter/libavfilter.so
 INSTALL	libavformat/libavformat.a
 INSTALL	libavformat/libavformat.so
-INSTALL	libavcodec/libavcodec.a
 INSTALL	libavcodec/libavcodec.so
+INSTALL	libavcodec/libavcodec.a
 INSTALL	libavresample/libavresample.a
 INSTALL	libavresample/libavresample.so
 INSTALL	libswscale/libswscale.a
@@ -1564,7 +1564,6 @@
 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
@@ -1579,6 +1578,7 @@
 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