diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 02:14:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 02:14:54 +0200 |
| commit | 923a242282c1a4e7469fff86a991929e71dfc6e4 (patch) | |
| tree | ad0f2f9d396258d1b8db53205414e453450d5294 /common.mak | |
| parent | 7652b176fcb36fe1fc5b052d30696a829012dd29 (diff) | |
| parent | 91eef402037ae5a51d89ade6cb71cdd70b291c8b (diff) | |
| download | ffmpeg-923a242282c1a4e7469fff86a991929e71dfc6e4.tar.gz | |
Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'
* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b':
avcodec: add enum values on chroma sample location
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions