diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:37:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:37:45 +0200 |
commit | 97a5b4ba53a10aa8c5ecf2ccf18c61e6724bebd3 (patch) | |
tree | de1fb47b6176dbcdd2b13383aa6c39907d20a0a1 /libavcodec/nuv.c | |
parent | f2275400fe52cd0a58e532a2d048c094a5074068 (diff) | |
parent | 0f71a5df4bc913f17a53c7ac66d4957914fa1d3d (diff) | |
download | ffmpeg-97a5b4ba53a10aa8c5ecf2ccf18c61e6724bebd3.tar.gz |
Merge commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d' into release/0.10
* commit '0f71a5df4bc913f17a53c7ac66d4957914fa1d3d':
h264: do not use 422 functions for monochrome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/nuv.c')
0 files changed, 0 insertions, 0 deletions