* commit '6b3ef7f0':
  lavu: Remove bit packing from AVComponentDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b8b5d827':
  lavu: extend size of the AVPixFmtDescriptor.flags field
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '77cf2366':
  asfdec: alloc enough space for storing name in asf_read_metadata_obj
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7cad1bf0':
  mov: Allow more than one keyframe per trun
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd0f7e4a5':
  dxtory: Unify and rework the decoding routines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3cdda78d':
  checkasm: add unit tests for v210enc
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '599fe93a':
  riff: Add AVj2 fourcc for Avid jpeg2000
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a7e6fbd9':
  dxtory: Factorize the buffer loading
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '6a6bc43f':
  dxtory: Factorize slice size checks
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'db9fd1e9':
  fraps: increase vlc nb_bits
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '741d353a':
  huffman: allow specifying nb_bits to ff_huff_build_tree()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '26960aa1':
  huffman: increase bits constant
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5a19bce2':
  huffman: use a named identifer for the bits constant
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

Untested.

This broke win32, MSYS

This reverts commit 3e830b6d.

Change-Id: I23a36c65915f01a1cf20e317c14b8eaaa62958b4
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>

Fixes Decoding of http://loongnix.org/ftp/multimedia/testing/nanocore_720p_24fps_mpeg4_ac3_short.aviSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Change-Id: Ic87fb8f5cd22a502ff9dbbc5a5a8ea97cfc8a1dd
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

They allow reconnecting endless live streams which fail with eof
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Based on a patch by wm4.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

This patch introduces color warning messages (yellow).
They are enabled whenever available.
Tested with zsh, bash, and sh (bash under --posix).
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9ad1e0c1':
  mux: Make sure that the data is actually written
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e05f7ed5':
  file: properly forward errors from file_read() and file_write()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5a1a9da8':
  mpegvideo: Drop a stray error message
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c45fcf30':
  DXV decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

There is no practical benefit in having this structure elements
bit packed given the size of the structure and its usage.
Change types from uint16_t (packed) to plain int in order to simplify
modifying the structure and accessing its fields.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The previous restriction was partially designed to fix certain
(broken) samples from bug 215. There should be no restriction on the
number of keyframes per fragment or trun.

The spec suggests that all frames lacking MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC
are key frames, but we require the flag MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES
to be unset as well. This works for (possibly broken) media that never
sets the NON_SYNC flag and should also be correct for any spec-compliant
file.

For files that never set either of the flags, all samples are marked
as keyframes.
Signed-off-by: Martin Storsjö <martin@martin.st>