diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 00:24:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 00:24:45 +0200 |
| commit | 61e1287551cd912b9744b7ffa813686afa1f97e2 (patch) | |
| tree | 4b4058741259059d47467dce4b2c59f856635483 /libswresample/rematrix_template.c | |
| parent | b66b1a103fff88682fab7960e698080f6b847098 (diff) | |
| parent | 3f38d4b816b2aeca15c0b90000ea7ed40377eb0c (diff) | |
| download | ffmpeg-61e1287551cd912b9744b7ffa813686afa1f97e2.tar.gz | |
Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
* commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c':
vp9: Parse subsampling and report missing feature
Conflicts:
libavcodec/vp9.c
libavcodec/vp9.h
No change as FFmpeg already supports subsampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/rematrix_template.c')
0 files changed, 0 insertions, 0 deletions