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

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

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

This helps when grepping for "gop".

* commit '2268db2c':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* 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.