Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:14:54 +0000 (02:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:14:54 +0000 (02:14 +0200)
commit923a242282c1a4e7469fff86a991929e71dfc6e4
treead0f2f9d396258d1b8db53205414e453450d5294
parent7652b176fcb36fe1fc5b052d30696a829012dd29
parent91eef402037ae5a51d89ade6cb71cdd70b291c8b
Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'

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

Conflicts:
libavcodec/version.h

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