avformat: Fix references to removed av_close_input_file in Doxygen
movenc: Allow chapter track in default MODE_MP4

Signed-off-by: Martin Storsjö <martin@martin.st>
movenc: Allow chapters to be written in trailer

This allows creation of frame accurate chapter marks from sources
like DVD and BD where the precise chapter location is not known until
the chapter mark has been reached during reading.

Signed-off-by: Martin Storsjö <martin@martin.st>
avcodec: Remove some commented-out debug cruft
vf_fps: add 'start_time' option

This allows for dropping or duplication to match a particular start time.
Add a libfdk-aac decoder

This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.
h264data: Remove unused luma_dc_field_scan table
h264data: Move some tables to the only place they are used
h264_ps: Drop commented-out cruft
h264_ps: K&R formatting cosmetics
h264_ps: Use more meaningful error values
avformat/unix: include sys/socket.h

unbreak android ndk r8 build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/unix: reshuffle #includes

This should fix openbsd while hopefully also working on solaris & android

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Merge commit '64af59bc4916fac5578b31c89da13c30b591bddf'

* commit '64af59bc4916fac5578b31c89da13c30b591bddf':
  avformat: Fix references to removed av_close_input_file in Doxygen

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

* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
  movenc: Allow chapter track in default MODE_MP4

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

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

Conflicts:
	libavformat/movenc.c

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

* commit '2a61592573d725956a4377641344afe263382648':
  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>
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'

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

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c

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

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

Conflicts:
	configure
	libavcodec/version.h

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