Michael Niedermayer 7eb959bf0b Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc' ...

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

Conflicts:
	libavutil/version.h

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

2014-10-08 22:37:59 +02:00

32 KiB

Raw Blame History

View Raw