Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

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

Conflicts:
	libavutil/version.h

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

diff --cc libavutil/pixfmt.h
Simple merge

diff --cc libavutil/version.h
index 92a57765dfabd800e15dae8a2786f3f44ee9345f,79da1aa1ab7786e74c01430ef246b0f0e0a31289..ae5dd65a4e86311a403a75bf85355451e1de7f3d
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 54
 -#define LIBAVUTIL_VERSION_MINOR  3
 -#define LIBAVUTIL_VERSION_MICRO  1
 +#define LIBAVUTIL_VERSION_MAJOR  54
 +#define LIBAVUTIL_VERSION_MINOR   9
- #define LIBAVUTIL_VERSION_MICRO 100
++#define LIBAVUTIL_VERSION_MICRO 101
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \