Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:09:38 +0000 (01:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 23:09:38 +0000 (01:09 +0200)
commitfaa1d4b1340f493ddc703706c9ab62bfc64835de
tree528e092037b44ce6d71ef3c76cbaec10ea1fef07
parentf6e772f9b5cf9040c268caed8b027a9c186812ef
parentab72eda15e98197cf148abc08574206cfde0d9b0
Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'

* commit 'ab72eda15e98197cf148abc08574206cfde0d9b0':
  pixfmt: mark the reserved values

Conflicts:
libavutil/version.h

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