Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:37:59 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:37:59 +0000 (22:37 +0200)
commit7eb959bf0b961e308e3068f161ee94e82e02355d
tree3dddbd13b59e7a3b42032b8022df5fa76b98992f
parent1b6172dcf619156b777fc29ae82e90fd42328fc0
parent04ccd584a70fad4ebb29ca340d704970ff313cbc
Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

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

Conflicts:
libavutil/version.h

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