* commit '93f29948':
  mpeg4video: Fix doxygen comment syntax to document correct struct member

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

* commit '0528226a':
  a64: Return correct error code on invalid data stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e070d0a5':
  frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers

Conflicts:
	libavutil/frame.c

No change, as these leftovers have already been removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ab059f0a':
  vaapi: set the scaling list correctly.

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

Also fix some comment typos.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

Fixes VAAPI decoding artefacts.

CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>

commit db68ef89 did not update the vp8 parser
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

S268M-2003 specifies that each line start is aligned on a 4-byte boundary.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is basically a wrapper around av_get_audio_frame_duration(), with a
fallback to AVCodecContext.frame_size. However, that field is set only
when the stream codec context is actually used for encoding or decoding,
which is discouraged.

For muxing, it is generally the responsibility of the caller to set the
packet duration.
For demuxing, if the duration is not stored at the container level, it
should be set by the parser.

Therefore, removing the frame_size fallback should not break any
important case.
(cherry picked from commit 30e50c50)

Conflicts:

	libavformat/utils.c
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>

* commit 'e8049af1':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
	libavformat/mpegtsenc.c

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

* commit '35324054':
  cpu-test: Add unistd.h #include for getopt()

No change as we already have a #include <unistd.h>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '30e50c50':
  lavf: eliminate ff_get_audio_frame_size()

Conflicts:
	libavformat/utils.c

Not merged as the removed code is needed for some bugfixes and
would break the fate tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '481a3667':
  cmdutils: allow matching by metadata in stream specifiers

Conflicts:
	Changelog
	cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8ddc3262':
  mem: add av_strndup() for duplicating substrings

Conflicts:
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa51b049':
  avconv: rename output_packet() to process_input_packet()

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

* commit '159a06df':
  stereo3d: initialize AVStereo3D to zero
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4e629ef8':
  http: Fix authentication, broken since 6a463e7fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db68ef89':
  ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

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

* commit 'cc3e88a2':
  mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.

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

* commit 'fa3a5dd4':
  nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0f789322':
  flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '93c04e09':
  Expose metadata found in onCuePoint events in .flv files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '019d3fcc':
  Set protocol-level metadata in AVFormatContext any time a packet is read.

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

* commit '7e38903b':
  http: enable icy metadata by default.

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

* commit '7601f941':
  http: export icecast metadata as an option with name "metadata".
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8c104a5':
  AVOption: add support for dictionary types.

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'afbd4b7e':
  lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.

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

Prevent out of array writes.

Similar to what Michael Niedermayer did to address the same issue.

Bug-Id: CVE-2014-2263
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Fixes ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is basically a wrapper around av_get_audio_frame_duration(), with a
fallback to AVCodecContext.frame_size. However, that field is set only
when the stream codec context is actually used for encoding or decoding,
which is discouraged.

For muxing, it is generally the responsibility of the caller to set the
packet duration.
For demuxing, if the duration is not stored at the container level, it
should be set by the parser.

Therefore, removing the frame_size fallback should not break any
important case.