* commit '91eef402':
  avcodec: add enum values on chroma sample location

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

* commit '9d5fed6d':
  avcodec: fix descriptions on color transfer options
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '167e6f14':
  dump: Update streams and chapters printout format

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

* commit '9f3a70c4':
  dump: print the original coded dimensions when available
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41e86146':
  dump: print detailed color space information

full color triplets are only printed if they are not all equal, otherwise
they are printed as before
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The default is to maintain the previous ", " for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The default is to maintain the previous ", " for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '20a5956b':
  dump: split audio and video probing on multiple lines

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

* commit '5a419b2d':
  pixdesc: return color properties names

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

* commit '04ccd584':
  pixfmt: mark further reserved values

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

* commit 'c732c62c':
  doc: expand description for some color properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a2c00d22':
  avprobe: print color properties for show_streams

Conflicts:
	avprobe.c

Not merged as this code does not build and is incomplete, some parts only
appear in later commits.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '147f2e91':
  avcodec: make sure color_range is properly initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '04d14c9b':
  vc1: Split the decoder in components

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

* commit '7ae9791b':
  avformat: bump version after mime_type change

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

* commit 'b15b06eb':
  avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

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

avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps

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

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

This matches the -map option which requires '%d:%d' format.

Also always report pixel format.

Speed up the overall compilation time.

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

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

This makes the field consistent with AVInputFormat.mime_type and the
argument type of av_match_name.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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>

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

* commit '2d91abad':
  x86: h264_intrapred: Don't treat 32-bit integers as 64-bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '82f8eb5f':
  jpeg2000: split off inverse MCT as Jpeg2000DSP

Conflicts:
	libavcodec/Makefile
	libavcodec/jpeg2000dec.c
	libavcodec/jpeg2000dsp.c
	libavcodec/jpeg2000dsp.h

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