* commit 'fe5d5a8f':
  movenc: Make chapter track QuickTime compatible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f8ef91ff':
  movenc: add faststart option for web streaming

Conflicts:
	doc/muxers.texi
	libavformat/movenc.c
	libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4622f11f':
  w32pthread: help compiler figure out undeeded code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b45269c':
  x86: h264_idct: Remove incorrect comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fix spurious failures.

Fixes out of array accesses
Fixes Ticket2850
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.

The example shows how to combine bsfs and select options.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

QuickTime requires that the stsd.text box be completely filled in.
Signed-off-by: Martin Storsjö <martin@martin.st>

Faststart moves the moov atom to the beginning of the file and rewrites
the rest of the file after muxing is complete.
Signed-off-by: Martin Storsjö <martin@martin.st>

The emulation code is not needed when targetting Vista+
This helps getting rid of CreateSemaphore symbol, which is
forbidden in Windows Store apps.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c18838f5':
  h264_ps: Use more meaningful error values

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

* commit '330ad1f6':
  h264_ps: K&R formatting cosmetics

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

* commit '8fed466b':
  h264_ps: Drop commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c4e43560':
  h264data: Move some tables to the only place they are used

Conflicts:
	libavcodec/h264data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f34de148':
  h264data: Remove unused luma_dc_field_scan table
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4f2b469d':
  Add a libfdk-aac decoder

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

* commit '545a0b80':
  vf_fps: add 'start_time' option

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2a615925':
  avcodec: Remove some commented-out debug cruft

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mvpred.h
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6c786765':
  movenc: Allow chapters to be written in trailer

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

* commit 'db03cb37':
  movenc: Allow chapter track in default MODE_MP4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '64af59bc':
  avformat: Fix references to removed av_close_input_file in Doxygen
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This should fix openbsd while hopefully also working on solaris & android
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

unbreak android ndk r8 build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses
Fixes Ticket2844

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