diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 23:39:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 23:40:50 +0200 |
| commit | fa040c224703a51d8a07ec33354ab47d275c0493 (patch) | |
| tree | 73c4e677a5a176ea58a5d03d23452f02a58235a0 /ffprobe.c | |
| parent | 837605704dafdfe7df2a87fd3eac2a8458e3329c (diff) | |
| parent | fc1eda543c6ef043300612db90da5cfd972af650 (diff) | |
| download | ffmpeg-fa040c224703a51d8a07ec33354ab47d275c0493.tar.gz | |
Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
swscale: fix sign extensions in yuv planar conversion
Conflicts:
libswscale/rgb2rgb_template.c
See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5
See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions