diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:48:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:49:53 +0100 |
| commit | 42431a557e2df0289e725b518b0d7a3e1a4e39b3 (patch) | |
| tree | abdfd5a10c54e8130e836a17a10a21ac82d205a3 /libavcodec/timecode.c | |
| parent | e88f392733fe6269fdb3fea2627b037ff654c4ce (diff) | |
| parent | d6d5ef5534d582f9dbaf18ac2605cf5bb72cd821 (diff) | |
| download | ffmpeg-42431a557e2df0289e725b518b0d7a3e1a4e39b3.tar.gz | |
Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'
* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
sws: GBRP9, GBRP10, and GBRP16 output support
Conflicts:
libswscale/output.c
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 'libavcodec/timecode.c')
0 files changed, 0 insertions, 0 deletions