[FFmpeg-cvslog] Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 02:14:54 2014 +0200| [923a242282c1a4e7469fff86a991929e71dfc6e4] | committer: Michael Niedermayer

Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'

* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b':
  avcodec: add enum values on chroma sample location

Conflicts:
	libavcodec/version.h

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

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