diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 13:13:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 13:18:28 +0100 |
| commit | fe54f6cb453c030f9aae2a703bf1e1e00caeb041 (patch) | |
| tree | d5e724bd65a1725c398dd08e9715f6d3b877e9bc /library.mak | |
| parent | e2b703f53612680f4be6721e51100bd552d55dd8 (diff) | |
| parent | 4c51fe48ba6dde059360b7451db7f6bbf2f11db3 (diff) | |
| download | ffmpeg-fe54f6cb453c030f9aae2a703bf1e1e00caeb041.tar.gz | |
Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
h264: Copy h264chroma dsp context to slice thread copies
swscale: Disallow conversion to GBRP16
Conflicts:
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions