Fix standalone compilation of the wtv muxer.
avfilter/avfiltergraph: dont "or" together error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_format: Check pix_fmts before dereferencing it

Fixes CID1224286

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
hevc: Use the local context variable when needed
lavf: document av_dump_format()
avfilter/af_aphaser: move wave table generation code into separate file

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avfilter: add flanger filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation

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

* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

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

* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
	libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/avformat: minor grammar improvement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_drawtext: fix resource leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ivfenc: support VP9

libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat: Add image3 demuxers with format autodetection

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ismindex: Allow adding a path prefix to the generated .ism file

This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.

Signed-off-by: Martin Storsjö <martin@martin.st>
ismindex: Add an option for outputting files elsewhere than in the current directory

Signed-off-by: Martin Storsjö <martin@martin.st>
daud: split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
id3v2enc: use a case-insensitive comparison for APIC picture type
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>