* commit '0a024268':
  libxvid: K&R formatting cosmetics

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

* commit '56a721f0':
  doc: fix a typo

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4c8bd8dd':
  os_support: Adjust an outdated #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes mbap and quant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

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

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

* commit '4e9e6fa9':
  mpeg: Write H264 streams at offset 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a4d3c200':
  vc1: Fix the skip condition

Conflicts:
	libavcodec/vc1_parser.c

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

* commit 'ab56fabe':
  vfwcap: Add fallback define for HWND_MESSAGE

The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
    commit 8bc52dbd
        vfwcap: Drop fallback VfW defines
        The defines were added long ago when MinGW still lacked them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Required to add support for the aq_mode setting.
Any libvpx snapshot prior to 1.3.0 is not recommended for vp9 encoding for that matter.
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

It hints that the content is H264 according to HD-DVD.

As written in the comment above, skip must be added only if a
start code is found.

Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.

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

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)
OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

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

If width is odd, last sample wouldn't be written.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.

This fixes coverity defect CID1231991.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
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>

Fixes bitrate detection in CBR mpeg2
Fixes ticket3678

* commit '6ee1cb57':
  libavformat: use MSG_NOSIGNAL when applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b263f8ff':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6ca11f71':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.
Signed-off-by: Martin Storsjö <martin@martin.st>

It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.

This reverts commit 1506ea94.

Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"

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

'Title' was deprecated with 9985710aSigned-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Comming from commit 1013d8dd
the old Port and BindAddress config vars have been deprecated
in favor of HTTPPort and HTTPBindAddress respectively.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>