[FFmpeg-cvslog] Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  8 22:37:59 2014 +0200| [7eb959bf0b961e308e3068f161ee94e82e02355d] | committer: Michael Niedermayer

Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

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

Conflicts:
	libavutil/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7eb959bf0b961e308e3068f161ee94e82e02355d
---