movenc: Add an F4V muxer

F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.

Signed-off-by: Martin Storsjö <martin@martin.st>
avfilter: Fix typo in Loren's email address
mpegvideo: Drop a faulty assert

That check is easily reachable by faulty input.

CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/movenc.c
	libavformat/version.h

See: 7bc70930ddc487712419e65ebca4d77868a20ffb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

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

* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
	libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
fix order of operations in comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vc1dec: use logical operation instead of bitwise for twomv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>