diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 12:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-24 12:01:29 +0200 |
| commit | 7dec8512be12675e84213c744c1aa511bed4d057 (patch) | |
| tree | d4a24c9cd1eb9223e65ca658c4b2d916d79bca64 /libswscale/swscale_unscaled.c | |
| parent | da0f67b177adaa3f792038bff174d015da1179a4 (diff) | |
| parent | 6fd221e5f8b0dcd33c249e553ea0be87778f2479 (diff) | |
| download | ffmpeg-7dec8512be12675e84213c744c1aa511bed4d057.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
8bps: Make the bound-checks consistent
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions