Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'

* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
  avplay: Factorize code for adding filters to the filter pipeline

Conflicts:
ffplay.c

See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'

* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
  avplay: Do not print a possibly uninitialized value

Conflicts:
ffplay.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'

* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
ffplay.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

linker's behaviour has changed on Android-M