[FFmpeg-cvslog] Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 24 01:09:38 2014 +0200| [faa1d4b1340f493ddc703706c9ab62bfc64835de] | committer: Michael Niedermayer

Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'

* commit 'ab72eda15e98197cf148abc08574206cfde0d9b0':
  pixfmt: mark the 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=faa1d4b1340f493ddc703706c9ab62bfc64835de
---