log: Do not assume the TERM variable is always set
lavu/opt: dont crash on freeing NULL AVOptionRanges

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '006c253346d90f4abaf69d78083c8ba031628598'

* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/ffmpeg: restore ascii arrows in Simple filtergraphs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
log: Factorize check_color_terminal() out
Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'

* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
  log: Support for 256color terminals

Conflicts:
	doc/APIchanges
	libavutil/log.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'

* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6':
  log: Remove undefined behaviour

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb'

* commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb':
  log: Document AV_LOG_C usage

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

* qatar/master:
  log: Do not assume the TERM variable is always set

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avutil/log: add code to test av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/log: fix negative log levels

These where broken by 7763118cae4eb468b032dbd29af15a011c2c233b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/log: remove stray ;

regression since  5a18b215f7138c0bd59f27389050b0311fa4a549

Reported-by: J_Darnley
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
log: Unbreak windows support

Add the missing define.
mxf: Remove typo

Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>
avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context()

Fixes crash

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
isom: add 'm1v ' tag

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
isom: add 'flic' tag
isom: add some BOXX tags
riff: Add ITRK tag

Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT
riff: add ISMP/timecode tag