* commit 'f4d371b9':
  rtsp: Don't include the listen flag in the SDP demuxer flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1061054
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1061053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes gcc warnings
Fixes CID1061056
Fixes CID1061057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cigaes/master:
  ffmpeg: remove obsolete workaround in trim insertion.
  lavu/log: do not skip overwritten lines.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1061052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1061059
Fixes fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1061058
Fixes fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The check that gurantees this isnt recognized by coverity for
example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The bug it was working seems to have been fixed.
This change causes ffmpeg to use the trim filter to implement
the -t option.
FATE tests are updated due to the more accurate handling of
the last packets.

If the line ends with \r, it will not flood the tty, and
the "Last message repeated" line would overwrite it.
Fix bug introduced by c25d1ba5.

Fixes division by 0
Fixes Ticket2841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It's only relevant for the RTSP demuxer. Similarly, the custom_io
flag is only present in the SDP demuxer options list.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '62572435':
  rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f542dedf':
  rtspenc: Check the return value from ffio_open_dyn_packet_buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Needed for cross-compiling with MinGW-w64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.

'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and
tells the user to upgrade to 2.6 if they want to make video input
work. A real solution to #2526 would be to get video input from
2.5.8 to work right.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Martin Storsjö <martin@martin.st>

Also clear the AVIOContext handle after freeing, to avoid
possible dangling pointers if the later call fails.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Developers added are active and in the copyright of the specified files,

If anyone wants to maintain anything else, send a patch that adds you to
MAINTAINERS.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2802
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Its not needed and doing nothing is faster than doing a optimized MOD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
	libavcodec/pcm-mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6fb65973':
  configure: Properly split dv1394 indev dependencies

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

* commit '61c31e4e':
  configure: Properly set zlib dependencies for all components

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

* commit 'a7d45e06':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

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

* commit '406e6c0b':
  configure: Properly split avserver component and system dependencies

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

* commit '255d9c57':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3dd5c95d':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fcc455ff':
  avformat/dv: K&R formatting cosmetics

Conflicts:
	libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'abe5268c':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
	libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2a0ec47b':
  unix: Convert from AVERROR to errno range before comparing error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>