avstring-test: Mark pointer passed to av_free() as non-const

libavutil/avstring.c:278:9: warning: passing argument 1 of ‘av_free’ discards ‘const’ qualifier from pointer target type
h263: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
golomb: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avfilter/vf_scale: Correct vf_scale mappings from arguments to color range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf/adtsenc: Add support for APE tags

Should fix ticket #2269

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/framehash: add software version to framecrc/md5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/utils: use a default lock manager that uses a pthread mutex

That makes avformat & avcodec thread safe without the need to explicitly
register a lock manager.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/log: make default av_log callback thread safe

This uses a pthread mutex

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/log: document log callback thread saftey requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'

* commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88':
  avstring-test: Mark pointer passed to av_free() as non-const

See: ab796ded757e616cb9167c0a15d70903b86e00f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
fate: fix fieldorder test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
	libavcodec/h263dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
	libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL

Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: add displace video filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>