diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:26:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:26:49 +0200 |
| commit | 28875c418886e1576b657882ee2b969de85041a0 (patch) | |
| tree | ce73485cdc210515b928f60baa63f9029fc54a26 /libavcodec/xiph.c | |
| parent | d3284a62082b8224d2a31e050f160ccda9ce2487 (diff) | |
| parent | 60c4660ba035bbfbcc84ac34129ce40e037c70ad (diff) | |
| download | ffmpeg-28875c418886e1576b657882ee2b969de85041a0.tar.gz | |
Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'
* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
swscale: fix an implementation-defined unsigned-to-signed conversion
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions